diff --git a/cmd/cc-backend/main.go b/cmd/cc-backend/main.go
index 104182f..6239d36 100644
--- a/cmd/cc-backend/main.go
+++ b/cmd/cc-backend/main.go
@@ -263,7 +263,7 @@ func generateJWT(authHandle *auth.Authentication, username string) error {
 		return fmt.Errorf("generating JWT for user '%s': %w", user.Username, err)
 	}
 
-	fmt.Printf("JWT: Successfully generated JWT for user '%s': %s\n", user.Username, jwt)
+	cclog.Printf("JWT: Successfully generated JWT for user '%s': %s\n", user.Username, jwt)
 	return nil
 }
 
diff --git a/configs/config-demo.json b/configs/config-demo.json
index 70ca2a0..58366fb 100644
--- a/configs/config-demo.json
+++ b/configs/config-demo.json
@@ -29,6 +29,11 @@
       "max-age": "2000h"
     }
   },
+  "nats": {
+    "address": "nats://0.0.0.0:4222",
+    "username": "root",
+    "password": "root"
+  },
   "clusters": [
     {
       "name": "fritz",
@@ -86,6 +91,16 @@
       "interval": "1h",
       "directory": "./var/archive"
     },
-    "retention-in-memory": "48h"
+    "retention-in-memory": "48h",
+    "subscriptions": [
+      {
+        "subscribe-to": "hpc-nats",
+        "cluster-tag": "fritz"
+      },
+      {
+        "subscribe-to": "hpc-nats",
+        "cluster-tag": "alex"
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/internal/memorystore/lineprotocol.go b/internal/memorystore/lineprotocol.go
index aebdbdc..6404361 100644
--- a/internal/memorystore/lineprotocol.go
+++ b/internal/memorystore/lineprotocol.go
@@ -64,7 +64,6 @@ func ReceiveNats(ms *MemoryStore,
 		cclog.Infof("NATS subscription to '%s' established", sc.SubscribeTo)
 	}
 
-	<-ctx.Done()
 	close(msgs)
 	wg.Wait()
 
diff --git a/startDemo.sh b/startDemo.sh
index 904caa0..e709db2 100755
--- a/startDemo.sh
+++ b/startDemo.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-rm -rf var
+# rm -rf var
 
 if [ -d './var' ]; then
   echo 'Directory ./var already exists! Skipping initialization.'
@@ -14,23 +14,9 @@ else
   cp ./configs/env-template.txt .env
   cp ./configs/config-demo.json config.json
 
-  echo 3 > /home/adityauj/cc-backend/var/job-archive/version.txt
-
-  ./cc-backend --loglevel info -migrate-db
-  ./cc-backend --loglevel info -dev -init-db -add-user demo:admin,api:demo
-  
-   # Generate JWT and extract only the token value
-  JWT=$(./cc-backend -jwt demo | grep -oP "(?<=JWT: Successfully generated JWT for user 'demo': ).*")
-
-  # Replace the existing JWT in test_ccms_write_api.sh with the new one
-  if [ -n "$JWT" ]; then
-    sed -i "1s|^JWT=.*|JWT=\"$JWT\"|" test_ccms_write_api.sh
-    echo "✅ Updated JWT in test_ccms_write_api.sh"
-  else
-    echo "❌ Failed to generate JWT for demo user"
-    exit 1
-  fi
+  ./cc-backend -migrate-db
+  ./cc-backend -dev -init-db -add-user demo:admin,api:demo
 
   ./cc-backend -server -dev
 
-fi
+fi
\ No newline at end of file