diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..4d5d1a9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+.env
+compose.yml
+README.md
+database
+database
diff --git a/.env.sample b/.env.sample
index ce32924..30dd97f 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,8 +1,11 @@
-DB_HOST="172.0.0.1"
+DB_HOST="db"
+DB_ROOT_PASSWORD="root_password"
 DB_USER="openunitstate"
 DB_PASSWORD=""
 DB_NAME="openunitstate"
+MQTT_URL="mqtt://broker.example.com:1883"
 MQTT_CLIENT_ID="njs_1"
 MQTT_USERNAME="ousbackendmaster"
 MQTT_PASSWORD=""
-MQTT_PUB_CLIENT_ID="njs_publisher"
\ No newline at end of file
+MQTT_PUB_CLIENT_ID="njs_publisher"
+ROOT_TOPIC="openunitstate"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 33cca4c..4feb209 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,4 @@ dist
 # Vite logs files
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+database
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9f86808
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+FROM node:25
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+CMD ["npm", "start"]
\ No newline at end of file
diff --git a/app.js b/app.js
index 91cfc46..0e30271 100644
--- a/app.js
+++ b/app.js
@@ -93,9 +93,9 @@ function parseMessage(topic, message) {
 
     var meta = topic.replace(ROOT_TOPIC + "/", "").split("/")
 
-    var orgId = meta[0]
-    var chipId = meta[1]
-    var func = meta[2]
+    var orgId = '-1' // meta[0]
+    var chipId = meta[0]
+    var func = meta[1]
     var payload = message.toString()
 
     return {
@@ -142,10 +142,10 @@ async function pushUnitConfig(chipId) {
     var name = await getUnitName(chipId)
     var unitOrg = await getUnitOrg(chipId);
     if (unitOrg != null) {
-        console.log("Setting name on", chipId, "mqtt message:", ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/config_name", name)
-        mqtt_client.publish(ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/config_name", name)
-        console.log("Setting status on", chipId, "mqtt message:", ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/config_status", status)
-        mqtt_client.publish(ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/config_status", status.toString())
+        console.log("Setting name on", chipId, "mqtt message:", ROOT_TOPIC + "/" + chipId + "/config_name", name)
+        mqtt_client.publish(ROOT_TOPIC + "/" + chipId + "/config_name", name)
+        console.log("Setting status on", chipId, "mqtt message:", ROOT_TOPIC + "/" + chipId + "/config_status", status)
+        mqtt_client.publish(ROOT_TOPIC + "/" + chipId + "/config_status", status.toString())
     } else {
         console.log(chipId, "unitOrg is null")
     }
@@ -328,8 +328,8 @@ async function unlockUnit(chipId, unlockTime = 0) {
                 return;
             }
             unlockTime = unlockTime * 1000;
-            console.log("Unlocking", chipId, "mqtt message:", ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/unlocked_time", unlockTime)
-            mqtt_client.publish(ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/unlocked_time", unlockTime.toString())
+            console.log("Unlocking", chipId, "mqtt message:", ROOT_TOPIC + "/" + chipId + "/unlocked_time", unlockTime)
+            mqtt_client.publish(ROOT_TOPIC + "/" + chipId + "/unlocked_time", unlockTime.toString())
         } else {
             console.log("unlockUnit: Couldn't find org associated with chipId", chipId);
         }
@@ -341,8 +341,8 @@ async function showMessage(chipId, message) {
         var unitOrg = await getUnitOrg(chipId);
         console.log(unitOrg)
         if (unitOrg != null) {
-            console.log("Showing message", ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/quick_display_msg", message)
-            mqtt_client.publish(ROOT_TOPIC + "/" + unitOrg + "/" + chipId + "/quick_display_msg", message)
+            console.log("Showing message", ROOT_TOPIC + "/" + chipId + "/quick_display_msg", message)
+            mqtt_client.publish(ROOT_TOPIC + "/" + chipId + "/quick_display_msg", message)
         }
     });
 }
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 0000000..b2495e4
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,39 @@
+name: openunitstate-backend
+services:
+  db:
+    image: mariadb:latest
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${DB_NAME}
+      MYSQL_USER: ${DB_USER}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - ./database:/var/lib/mysql
+      - ./sql_structure_openunitstate.sql:/docker-entrypoint-initdb.d/init.sql
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      timeout: 20s
+      retries: 10
+    restart: unless-stopped
+
+  app:
+    build: .
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      DB_HOST: db
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_NAME: ${DB_NAME}
+      MQTT_URL: ${MQTT_URL}
+      MQTT_CLIENT_ID: ${MQTT_CLIENT_ID}
+      MQTT_USERNAME: ${MQTT_USERNAME}
+      MQTT_PASSWORD: ${MQTT_PASSWORD}
+      ROOT_TOPIC: ${ROOT_TOPIC}
+    restart: unless-stopped
+
+networks:
+  default:
+    driver: bridge 
+    name: openunitstate
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..4adfa11
--- /dev/null
+++ b/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "openunitstate-backend",
+  "version": "1.0.0",
+  "description": "Backend service for OpenUnitState",
+  "main": "app.js",
+  "scripts": {
+    "start": "node app.js",
+    "dev": "node app.js"
+  },
+  "dependencies": {
+    "mqtt": "^4.3.7",
+    "mysql": "^2.18.1"
+  },
+  "engines": {
+    "node": ">=12.0.0"
+  },
+  "keywords": [
+    "mqtt",
+    "mysql",
+    "iot",
+    "unit-state"
+  ],
+  "author": "",
+  "license": "GPL-3.0-only"
+}