diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml
index 953175bb..6a71478a 100644
--- a/.gitea/workflows/ci-cd.yml
+++ b/.gitea/workflows/ci-cd.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  REGISTRY_URL: 127.0.0.1:5000  # Host network access
+  REGISTRY_URL: docker-registry:5000  # Via host-gateway mapping  
   IMAGE_NAME: michaelschiemer
 
 jobs:
@@ -15,17 +15,17 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
-      options: --network host
+      options: --add-host=gitea:host-gateway --add-host=docker-registry:host-gateway
     services:
       redis:
         image: redis:8-alpine
-        options: --network host
+        options: --add-host=gitea:host-gateway --add-host=docker-registry:host-gateway
       mariadb:
         image: mariadb:latest
         env:
           MYSQL_ROOT_PASSWORD: test
           MYSQL_DATABASE: test
-        options: --network host
+        options: --add-host=gitea:host-gateway --add-host=docker-registry:host-gateway
 
     steps:
     - name: Checkout Code
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
-      options: --network host
+      options: --add-host=gitea:host-gateway --add-host=docker-registry:host-gateway
     if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
 
     steps: