diff --git a/Makefile b/Makefile
index 42395af..da45380 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-SPIN_VARIABLE_MQTT_BROKER_URI ?= "mqtt://localhost:1883"
+SPIN_VARIABLE_MQTT_BROKER_URI ?= "test.mosquitto.org"
 SPIN_VARIABLE_MQTT_TOPIC ?= "booth/+"
-REGISTRY ?= ghcr.io/kate-goldenring/spin-apps/mqtt-booth-volume
-TAG ?= v0.2.0
+REGISTRY ?= ghcr.io/fermyon/spin-mqtt-booth-volume
+TAG ?= latest
 VOLUME ?= 350
 BOOTH ?= 20
-BROKER_HOSTNAME ?= 127.0.0.1
+BROKER_HOSTNAME ?= test.mosquitto.org
 
 all: emqx spin-build-up
 
diff --git a/spinkube/app-deploy.yaml b/spinkube/app-deploy.yaml
index e52ad37..e6fa75b 100644
--- a/spinkube/app-deploy.yaml
+++ b/spinkube/app-deploy.yaml
@@ -15,7 +15,7 @@ spec:
       runtimeClassName: wasmtime-spin-v2
       containers:
         - name: mqtt-booth-volume
-          image: ghcr.io/kate-goldenring/spin-apps/mqtt-booth-volume:v0.2.0
+          image: ghcr.io/fermyon/spin-mqtt-booth-volume:latest
           imagePullPolicy: IfNotPresent
           command: ["/"]
           ports:
diff --git a/spinkube/spinapp.yaml b/spinkube/spinapp.yaml
index 633a13f..f480585 100644
--- a/spinkube/spinapp.yaml
+++ b/spinkube/spinapp.yaml
@@ -3,7 +3,7 @@ kind: SpinApp
 metadata:
   name: mqtt-booth-volume
 spec:
-  image: "ghcr.io/kate-goldenring/spin-apps/mqtt-booth-volume:latest"
+  image: "ghcr.io/fermyon/spin-mqtt-booth-volume:latest"
   executor: containerd-shim-spin
   replicas: 1
   variables: