diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index 10c615e..e2b6817 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -829,7 +829,11 @@ uninstall_jitsi() {
   if [[ -d "/federated/apps/jitsiopenid" ]]; then
     cd /federated/apps/jitsiopenid && docker compose -f docker-compose.yml -p jitsiopenid down &> /dev/null
     rm -rf /federated/apps/jitsiopenid
-    docker image rm mod242/jitsi-go-openid:latest &> /dev/null
+    if [ "$(uname -m)" = "aarch64" ]; then
+      docker image rm federatedcomputer/jitsi-go-openid:latest &> /dev/null
+    else
+      docker image rm mod242/jitsi-go-openid:latest &> /dev/null
+    fi
   fi
 
   echo -ne "done.\n"
@@ -894,12 +898,16 @@ EOF
   # Install Jitsi OpenID GO plugin
   mkdir -p /federated/apps/jitsiopenid &> /dev/null
 
-cat >> /federated/apps/jitsiopenid/docker-compose.yml <<EOF
-version: '3.7'
+  if [ "$(uname -m)" = "aarch64" ]; then
+    CONTAINER="federatedcomputer/jitsi-go-openid"
+  else
+    CONTAINER="mod242/jitsi-go-openid"
+  fi
 
+cat >> /federated/apps/jitsiopenid/docker-compose.yml <<EOF
 services:
   jitsiopenid:
-    image: mod242/jitsi-go-openid:\${IMAGE_VERSION}
+    image: ${CONTAINER}/jitsi-go-openid:\${IMAGE_VERSION}
     container_name: jitsiopenid
     hostname: jitsiopenid.$DOMAIN
     restart: always