diff --git a/_common/.env b/_common/.env
index 623db03..4834c2b 100644
--- a/_common/.env
+++ b/_common/.env
@@ -1 +1,5 @@
-OPENFIRE_TAG=latest
\ No newline at end of file
+OPENFIRE_IMAGE=openfire
+OPENFIRE_TAG=latest
+
+#OPENFIRE_IMAGE=ghcr.io/igniterealtime/openfire
+#OPENFIRE_TAG=main
\ No newline at end of file
diff --git a/cluster/docker-compose-clustered.yml b/cluster/docker-compose-clustered.yml
index e68fdb6..ca86e95 100644
--- a/cluster/docker-compose-clustered.yml
+++ b/cluster/docker-compose-clustered.yml
@@ -21,7 +21,7 @@ services:
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
 
   xmpp1:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5221:5222"
       - "5261:5269"
@@ -37,7 +37,7 @@ services:
     command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh", "-Dhazelcast.prefer.ipv4.stack=${PREFER_IPV4} -Djava.net.preferIPv6Addresses=${PREFER_IPV6}"]
 
   xmpp2:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5222:5222"
       - "5262:5269"
@@ -53,7 +53,7 @@ services:
     command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh", "-Dhazelcast.prefer.ipv4.stack=${PREFER_IPV4} -Djava.net.preferIPv6Addresses=${PREFER_IPV6}"]
 
   xmpp3:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5223:5222"
       - "5263:5269"
diff --git a/cluster_with_federation/docker-compose-clustered.yml b/cluster_with_federation/docker-compose-clustered.yml
index 0f0a429..9a4caf3 100644
--- a/cluster_with_federation/docker-compose-clustered.yml
+++ b/cluster_with_federation/docker-compose-clustered.yml
@@ -21,7 +21,7 @@ services:
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
 
   xmpp1:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5221:5222"
       - "5261:5269"
@@ -37,7 +37,7 @@ services:
     command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh", "-Dhazelcast.prefer.ipv4.stack=${PREFER_IPV4} -Djava.net.preferIPv6Addresses=${PREFER_IPV6}"]
 
   xmpp2:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5222:5222"
       - "5262:5269"
@@ -53,7 +53,7 @@ services:
     command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh", "-Dhazelcast.prefer.ipv4.stack=${PREFER_IPV4} -Djava.net.preferIPv6Addresses=${PREFER_IPV6}"]
 
   xmpp3:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5223:5222"
       - "5263:5269"
@@ -80,7 +80,7 @@ services:
       - ./sql/otherdomain:/docker-entrypoint-initdb.d
 
   otherxmpp:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5229:5222"
       - "5269:5269"
diff --git a/federation/docker-compose-federated.yml b/federation/docker-compose-federated.yml
index b65b2e5..c2f28d5 100644
--- a/federation/docker-compose-federated.yml
+++ b/federation/docker-compose-federated.yml
@@ -23,7 +23,7 @@ services:
       - ./sql/2:/docker-entrypoint-initdb.d
 
   xmpp1:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5221:5222"
       - "5261:5269"
@@ -39,7 +39,7 @@ services:
     command: ["/wait-for-it.sh", "-s", "db1:5432", "--", "/sbin/entrypoint.sh"]
 
   xmpp2:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5222:5222"
       - "5262:5269"
diff --git a/proxy/docker-compose.yml b/proxy/docker-compose.yml
index 5526094..0271d41 100644
--- a/proxy/docker-compose.yml
+++ b/proxy/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
   
   xmpp:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5222:5222"
       - "5269:5269"
diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml
index 34017ff..7a9fdd7 100644
--- a/simple/docker-compose.yml
+++ b/simple/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - ./sql:/docker-entrypoint-initdb.d
 
   xmpp1:
-    image: "openfire:${OPENFIRE_TAG}"
+    image: "${OPENFIRE_IMAGE}:${OPENFIRE_TAG}"
     ports:
       - "5222:5222"
       - "5269:5269"