diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 7e06b6d..184a3f3 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -1,6 +1,6 @@
 services:
-  ferdium:
+  ferdium-server:
     build:
-      context: ./docker/ferdium/
+      context: ./docker/ferdium-server/
       dockerfile: Dockerfile.production
-    image: git.nixc.us/nixius/ferdium:production
\ No newline at end of file
+    image: git.nixc.us/nixius/ferdium-server:production
\ No newline at end of file
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 509b527..7456640 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -1,6 +1,6 @@
 services:
-  ferdium:
+  ferdium-server:
     build:
-      context: ./docker/ferdium/
+      context: ./docker/ferdium-server/
       dockerfile: Dockerfile
-    image: git.nixc.us/nixius/ferdium:staging
+    image: git.nixc.us/nixius/ferdium-server:staging
diff --git a/docker/stirling/Dockerfile b/docker/ferdium-server/Dockerfile
similarity index 100%
rename from docker/stirling/Dockerfile
rename to docker/ferdium-server/Dockerfile
diff --git a/docker/ferdium-server/Dockerfile.production b/docker/ferdium-server/Dockerfile.production
new file mode 100644
index 0000000..9af0e87
--- /dev/null
+++ b/docker/ferdium-server/Dockerfile.production
@@ -0,0 +1 @@
+FROM git.nixc.us/nixius/ferdium-server:staging
\ No newline at end of file
diff --git a/docker/stirling/Dockerfile.production b/docker/stirling/Dockerfile.production
deleted file mode 100644
index 4b61da2..0000000
--- a/docker/stirling/Dockerfile.production
+++ /dev/null
@@ -1 +0,0 @@
-FROM git.nixc.us/nixius/ferdium:staging
\ No newline at end of file
diff --git a/stack.production.yml b/stack.production.yml
index 9cd2fd7..ac62113 100644
--- a/stack.production.yml
+++ b/stack.production.yml
@@ -5,7 +5,7 @@ networks:
     driver: overlay
 services:
   ferdium:
-    image: git.nixc.us/nixius/ferdium:production
+    image: git.nixc.us/nixius/ferdium-server:production
     networks:
       - traefik
     environment:
diff --git a/stack.staging.yml b/stack.staging.yml
index 76307f6..f2e1ff3 100644
--- a/stack.staging.yml
+++ b/stack.staging.yml
@@ -5,7 +5,7 @@ networks:
     driver: overlay
 services:
   ferdium:
-    image: git.nixc.us/nixius/ferdium:staging
+    image: git.nixc.us/nixius/ferdium-server:staging
     networks:
       - traefik
     # volumes: