diff --git a/.gitea/workflows/ci-dev.yml b/.gitea/workflows/ci-dev.yml
index 8effa89..5cc2d21 100644
--- a/.gitea/workflows/ci-dev.yml
+++ b/.gitea/workflows/ci-dev.yml
@@ -21,7 +21,7 @@ jobs:
         
         # Clone the repository since Gitea runner doesn't auto-checkout
         echo "Cloning repository..."
-        git clone --branch dev http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/jskala/NFOguard.git /tmp/repo
+        git clone --branch dev http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/sbcrumb/nfoguard.git /tmp/repo
         cp -r /tmp/repo/* .
         cp -r /tmp/repo/.* . 2>/dev/null || true
         rm -rf /tmp/repo
@@ -67,7 +67,7 @@ jobs:
       run: |
         echo "Building DEV Docker image with layer caching..."
         LOCAL_REGISTRY="192.168.253.221:3000"
-        CACHE_IMAGE="$LOCAL_REGISTRY/jskala/nfoguard:dev-buildcache"
+        CACHE_IMAGE="$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-buildcache"
         
         # Clear any existing Docker configs to prevent permission issues
         unset DOCKER_CONFIG
@@ -80,7 +80,7 @@ jobs:
         # Check if DEV cache image exists and pull it
         echo "Checking for existing DEV cache image..."
         CACHE_ARGS=""
-        if curl -s "http://$LOCAL_REGISTRY/v2/jskala/nfoguard/manifests/dev-buildcache" > /dev/null 2>&1; then
+        if curl -s "http://$LOCAL_REGISTRY/v2/sbcrumb/nfoguard/manifests/dev-buildcache" > /dev/null 2>&1; then
           echo "✅ DEV cache manifest found, pulling image..."
           if docker pull "$CACHE_IMAGE" 2>/dev/null; then
             echo "✅ DEV cache image pulled successfully"
@@ -119,18 +119,18 @@ jobs:
           echo "✅ DEV Login succeeded"
           
           # Tag for local registry
-          docker tag nfoguard:dev "$LOCAL_REGISTRY/jskala/nfoguard:dev"
-          docker tag nfoguard:dev "$LOCAL_REGISTRY/jskala/nfoguard:dev-${{ github.sha }}"
+          docker tag nfoguard:dev "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev"
+          docker tag nfoguard:dev "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-${{ github.sha }}"
           
           # Push DEV images
           echo "=== Pushing DEV cache image ==="
-          timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/jskala/nfoguard:dev-buildcache" && echo "✅ DEV cache pushed" || echo "⚠️ DEV cache push failed"
+          timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-buildcache" && echo "✅ DEV cache pushed" || echo "⚠️ DEV cache push failed"
           
           echo "=== Pushing DEV latest tag ==="
-          if timeout 120 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/jskala/nfoguard:dev"; then
+          if timeout 120 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev"; then
             echo "✅ DEV tag pushed successfully"
             
-            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/jskala/nfoguard:dev-${{ github.sha }}"; then
+            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-${{ github.sha }}"; then
               echo "✅ DEV SHA tag pushed successfully"
             fi
           fi
diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index e8094c8..3821c60 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
         
         # Clone the repository since Gitea runner doesn't auto-checkout
         echo "Cloning repository..."
-        git clone --branch main http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/jskala/NFOguard.git /tmp/repo
+        git clone --branch main http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/sbcrumb/nfoguard.git /tmp/repo
         cp -r /tmp/repo/* .
         cp -r /tmp/repo/.* . 2>/dev/null || true
         rm -rf /tmp/repo
@@ -70,7 +70,7 @@ jobs:
       run: |
         echo "Building Docker image with layer caching..."
         LOCAL_REGISTRY="192.168.253.221:3000"
-        CACHE_IMAGE="$LOCAL_REGISTRY/jskala/nfoguard:buildcache"
+        CACHE_IMAGE="$LOCAL_REGISTRY/sbcrumb/nfoguard:buildcache"
         
         # Clear any existing Docker configs to prevent permission issues
         unset DOCKER_CONFIG
@@ -83,7 +83,7 @@ jobs:
         # Check if cache image exists and pull it
         echo "Checking for existing cache image..."
         CACHE_ARGS=""
-        if curl -s "http://$LOCAL_REGISTRY/v2/jskala/nfoguard/manifests/buildcache" > /dev/null 2>&1; then
+        if curl -s "http://$LOCAL_REGISTRY/v2/sbcrumb/nfoguard/manifests/buildcache" > /dev/null 2>&1; then
           echo "✅ Cache manifest found, pulling image..."
           if docker pull "$CACHE_IMAGE" 2>/dev/null; then
             echo "✅ Cache image pulled successfully"
@@ -141,21 +141,21 @@ jobs:
           echo "✅ Login succeeded with direct method"
           
           # Tag for local registry (cache image already tagged in build step)
-          docker tag nfoguard:latest "$LOCAL_REGISTRY/jskala/nfoguard:latest"
-          docker tag nfoguard:latest "$LOCAL_REGISTRY/jskala/nfoguard:${{ github.sha }}"
+          docker tag nfoguard:latest "$LOCAL_REGISTRY/sbcrumb/nfoguard:latest"
+          docker tag nfoguard:latest "$LOCAL_REGISTRY/sbcrumb/nfoguard:${{ github.sha }}"
           
           echo "Pushing to LOCAL registry (gigabit speed!)..."
           
           # Push with reasonable timeout for local network
           echo "=== Pushing cache image (for faster future builds) ==="
-          timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/jskala/nfoguard:buildcache" && echo "✅ Cache image pushed" || echo "⚠️ Cache push failed"
+          timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:buildcache" && echo "✅ Cache image pushed" || echo "⚠️ Cache push failed"
           
           echo "=== Pushing latest tag to LOCAL IP ==="
-          if timeout 120 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/jskala/nfoguard:latest"; then
+          if timeout 120 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:latest"; then
             echo "✅ Latest tag pushed successfully to LOCAL registry"
             
             echo "=== Pushing SHA tag to LOCAL IP ==="
-            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/jskala/nfoguard:${{ github.sha }}"; then
+            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:${{ github.sha }}"; then
               echo "✅ SHA tag pushed successfully to LOCAL registry"
             else
               echo "⚠️ SHA tag push failed but latest succeeded"
@@ -186,7 +186,7 @@ jobs:
         echo "📦 Available images:"
         echo "  Local Docker: nfoguard:latest"
         echo "  Local SHA:    nfoguard:${{ github.sha }}"
-        echo "  Local Gitea:  192.168.253.221:3000/jskala/nfoguard:latest"
+        echo "  Local Gitea:  192.168.253.221:3000/sbcrumb/nfoguard:latest"
 
   deploy:
     needs: build