diff --git a/.cspell.json b/.cspell.json
index 755239b0..1cc7b0f8 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -53,6 +53,14 @@
     "noconflict",
     "sparkplugb",
     "protojson",
-    "typesafe"
+    "typesafe",
+    "DDATA",
+    "NDATA",
+    "NCMD",
+    "DCMD",
+    "NBIRTH",
+    "DBIRTH",
+    "NDEATH",
+    "DDEATH"
   ]
 }
\ No newline at end of file
diff --git a/app/src/actions/Publish.ts b/app/src/actions/Publish.ts
index 91130b41..ffebcc57 100644
--- a/app/src/actions/Publish.ts
+++ b/app/src/actions/Publish.ts
@@ -3,6 +3,7 @@ import { AppState } from '../reducers'
 import { Base64Message } from '../../../backend/src/Model/Base64Message'
 import { Dispatch } from 'redux'
 import { makePublishEvent, rendererEvents } from '../../../events'
+import { Decoder } from '../../../backend/src/Model/Decoder'
 
 export const setTopic = (topic?: string): Action => {
   return {
@@ -47,6 +48,14 @@ export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, ge
     retain: state.publish.retain,
     qos: state.publish.qos,
   }
+
+  if (
+    mqttMessage.payload &&
+    mqttMessage.topic.match(/spBv1\.0\/[^/]+\/(DDATA|NDATA|NCMD|DCMD|NBIRTH|DBIRTH|NDEATH|DDEATH\/[^/]+\/)/u)
+  ) {
+    mqttMessage.payload.decoder = Decoder.SPARKPLUG
+  }
+
   rendererEvents.emit(publishEvent, mqttMessage)
 }
 
diff --git a/backend/src/DataSource/MqttSource.ts b/backend/src/DataSource/MqttSource.ts
index e53d5a25..0ccd97f7 100644
--- a/backend/src/DataSource/MqttSource.ts
+++ b/backend/src/DataSource/MqttSource.ts
@@ -4,6 +4,8 @@ import { Client, connect as mqttConnect } from 'mqtt'
 import { DataSource, DataSourceStateMachine } from './'
 import { MqttMessage } from '../../../events'
 import { Base64Message } from '../Model/Base64Message'
+import { Decoder } from '../Model/Decoder'
+import { SparkplugEncoder } from '../Model/sparkplugb'
 
 export interface MqttOptions {
   url: string
@@ -98,7 +100,12 @@ export class MqttSource implements DataSource<MqttOptions> {
 
   public publish(msg: MqttMessage) {
     if (this.client) {
-      this.client.publish(msg.topic, msg.payload ? Base64Message.toUnicodeString(msg.payload) : '', {
+      let payload: string | Buffer = msg.payload ? Base64Message.toUnicodeString(msg.payload) : ''
+      if (msg.payload?.decoder === Decoder.SPARKPLUG) {
+        payload = SparkplugEncoder.encode(payload) || payload
+      }
+
+      this.client.publish(msg.topic, payload, {
         qos: msg.qos,
         retain: msg.retain,
       })
diff --git a/backend/src/Model/sparkplugb.ts b/backend/src/Model/sparkplugb.ts
index f9fc7ce1..d68de9ff 100644
--- a/backend/src/Model/sparkplugb.ts
+++ b/backend/src/Model/sparkplugb.ts
@@ -22,3 +22,21 @@ export const SparkplugDecoder = {
     return undefined
   },
 }
+
+export const SparkplugEncoder = {
+  encode(input: string): Buffer | undefined {
+    try {
+      const payload = JSON.parse(input)
+      return Buffer.from(
+        SparkplugPayload.encode(
+          SparkplugPayload.create({
+            timestamp: Date.now(),
+            ...payload,
+          })
+        ).finish()
+      )
+    } catch (err) {
+      console.error(err)
+    }
+  },
+}
diff --git a/scripts/prepare-release.ts b/scripts/prepare-release.ts
index 61532e37..dacc2e18 100644
--- a/scripts/prepare-release.ts
+++ b/scripts/prepare-release.ts
@@ -27,7 +27,6 @@ async function prepareRelease() {
   await exec('yarn', ['build'])
 
   // Clean up
-  await fs.remove('node_modules')
   await exec('yarn', ['install', '--production', '--frozen-lockfile']) // Do not clean up, electron version detection will fail otherwise
   await fs.remove(path.join('app', 'node_modules'))