diff --git a/template/apps/homebridge-debian.json b/template/apps/homebridge-debian.json
index 06fa59d..64c0d8a 100644
--- a/template/apps/homebridge-debian.json
+++ b/template/apps/homebridge-debian.json
@@ -30,9 +30,9 @@
 			"name": "TZ"
 		}
 	],
-	"image_arm32": "oznu/homebridge:debian-arm32v7",
-	"image_arm64": "oznu/homebridge:debian",
-	"image_amd64": "oznu/homebridge:debian",
+	"image_arm32": "homebridge/homebridge:ubuntu-arm32v7",
+	"image_arm64": "homebridge/homebridge:ubuntu",
+	"image_amd64": "homebridge/homebridge:ubuntu",
 	"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/homebridge.png",
 	"name": "homebridge-debian",
 	"network": "host",
diff --git a/template/apps/homebridge.json b/template/apps/homebridge.json
index 24b23e4..24e7204 100644
--- a/template/apps/homebridge.json
+++ b/template/apps/homebridge.json
@@ -30,9 +30,9 @@
 			"name": "TZ"
 		}
 	],
-	"image_arm32": "oznu/homebridge:latest",
-	"image_arm64": "oznu/homebridge:latest",
-	"image_amd64": "oznu/homebridge:latest",
+	"image_arm32": "homebridge/homebridge:latest",
+	"image_arm64": "homebridge/homebridge:latest",
+	"image_amd64": "homebridge/homebridge:latest",
 	"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/homebridge.png",
 	"name": "homebridge",
 	"network": "host",