diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 42b510e5..272e8eab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,6 +68,8 @@ jobs:
     needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
       with:
@@ -76,6 +78,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
           workdir: users/authservice
+          platforms: linux/amd64,linux/arm64
+          
   docker-push-userservice:
     name: Push user service Docker Image to GitHub Packages
     runs-on: ubuntu-latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 2fd2f552..17845c60 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
 
   authservice:
     container_name: authservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/asw2324_0/authservice:latest
+    image: ghcr.io/pglez82/asw2324_0/authservice:latest
     profiles: ["dev", "prod"]
     build: ./users/authservice
     depends_on:
@@ -27,7 +27,7 @@ services:
 
   userservice:
     container_name: userservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/asw2324_0/userservice:latest
+    image: ghcr.io/pglez82/asw2324_0/userservice:latest
     profiles: ["dev", "prod"]
     build: ./users/userservice
     depends_on:
@@ -41,7 +41,7 @@ services:
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/asw2324_0/gatewayservice:latest
+    image: ghcr.io/pglez82/asw2324_0/gatewayservice:latest
     profiles: ["dev", "prod"]
     build: ./gatewayservice
     depends_on:
@@ -58,7 +58,7 @@ services:
 
   webapp:
     container_name: webapp-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/asw2324_0/webapp:latest
+    image: ghcr.io/pglez82/asw2324_0/webapp:latest
     profiles: ["dev", "prod"]
     build: ./webapp
     depends_on:
@@ -107,4 +107,4 @@ volumes:
 
 networks:
   mynetwork:
-    driver: bridge
\ No newline at end of file
+    driver: bridge