diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
index be961aa..3399800 100644
--- a/.github/workflows/build_deploy.yml
+++ b/.github/workflows/build_deploy.yml
@@ -156,11 +156,8 @@ jobs:
           } >> "$GITHUB_OUTPUT"
       - name: Run prebuild tasks
         run: |
-          echo "🔄 Chdir to src/pkmntrade_club/"
-          cd src/pkmntrade_club/
-
-          echo "🔄 Chdir to theme/static_src"
-          cd theme/static_src
+          echo "🔄 Chdir to src/pkmntrade_club/theme/static_src"
+          cd src/pkmntrade_club/theme/static_src
 
           echo "📦 Install npm dependencies"
           npm install .
@@ -271,7 +268,7 @@ jobs:
             ssh deploy "cd ${{ steps.meta.outputs.REPO_PROJECT_PATH }} && docker compose -f docker-compose_core.yml -f docker-compose_staging.yml up -d --no-build"
           fi
 
-          # echo "🚀 Start the new containers"
+          # echo "🚀 Start the new containers, zero-downtime"
           # if [ "${PROD}" = true ]; then
           #   ssh deploy <<<END
           #     cd ${{ steps.meta.outputs.REPO_PROJECT_PATH}}
diff --git a/.gitignore b/.gitignore
index ec6218d..ac81fc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 .env.production
 .env
-staticfiles/*
-!staticfiles/.gitkeep
+src/pkmntrade_club/staticfiles/*
+!src/pkmntrade_club/staticfiles/.gitkeep
+src/pkmntrade_club/media/*
+!src/pkmntrade_club/media/.gitkeep
 seed/0004_TestUsers.json
 seed/0005_TradeOffers.json
 media/trade_offers
diff --git a/MANIFEST.in b/MANIFEST.in
index 5067ddb..1721016 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,30 +1,9 @@
 include README.md
 include LICENSE
 
-graft src/pkmntrade_club/accounts/templates
-graft src/pkmntrade_club/accounts/migrations
+graft src/pkmntrade_club
+prune src/pkmntrade_club/theme/static_src
+prune src/pkmntrade_club/staticfiles/*
+prune src/pkmntrade_club/media/*
 
-graft src/pkmntrade_club/cards/templates
-graft src/pkmntrade_club/cards/migrations
-
-graft src/pkmntrade_club/home/migrations
-
-graft src/pkmntrade_club/theme/templates
-graft src/pkmntrade_club/theme/templatetags
-graft src/pkmntrade_club/theme/static
-
-graft src/pkmntrade_club/trades/templates
-graft src/pkmntrade_club/trades/migrations
-
-graft src/pkmntrade_club/static
-
-recursive-include src/pkmntrade_club/accounts *.html *.py
-recursive-include src/pkmntrade_club/cards *.html *.py
-recursive-include src/pkmntrade_club/common *.html *.py
-recursive-include src/pkmntrade_club/django_project *.html *.py
-recursive-include src/pkmntrade_club/home *.html *.py
-recursive-include src/pkmntrade_club/static *
-recursive-include src/pkmntrade_club/theme *.html *.py
-recursive-include src/pkmntrade_club/trades *.html *.py
-
-global-exclude *.py[cod] __pycache__ .DS_Store .*
+global-exclude *.py[cod] __pycache__ .DS_Store .*
\ No newline at end of file
diff --git a/server/docker-compose_staging.yml b/server/docker-compose_staging.yml
index 70f2032..61a3c65 100644
--- a/server/docker-compose_staging.yml
+++ b/server/docker-compose_staging.yml
@@ -1,6 +1,6 @@
 services:
   web-staging:
-    image: badbl0cks/pkmntrade-club:edge
+    image: badbl0cks/pkmntrade-club:staging
     restart: always
     env_file:
       - .env
diff --git a/server/docker-compose_web.yml b/server/docker-compose_web.yml
index 8018d4a..f62e00c 100644
--- a/server/docker-compose_web.yml
+++ b/server/docker-compose_web.yml
@@ -2,7 +2,7 @@ services:
   web:
     image: ghcr.io/xe/x/httpdebug
     entrypoint: ["/ko-app/httpdebug", "--bind", ":8000"]
-    #image: badbl0cks/pkmntrade-club:edge
+    #image: badbl0cks/pkmntrade-club:stable
     #command: ["granian", "--interface", "wsgi", "pkmntrade_club.django_project.wsgi:app", "--host", "0.0.0.0", "--port", "8000", "--workers", "1", "--workers-kill-timeout", "180", "--access-log"] 
     # env_file:
     #   - .env
diff --git a/media/.gitkeep b/src/pkmntrade_club/media/.gitkeep
similarity index 100%
rename from media/.gitkeep
rename to src/pkmntrade_club/media/.gitkeep
diff --git a/src/pkmntrade_club/staticfiles/.gitkeep b/src/pkmntrade_club/staticfiles/.gitkeep
new file mode 100644
index 0000000..e69de29