diff --git a/comicvine-service.env b/comicvine-service.env
index f0b1f02..323b991 100644
--- a/comicvine-service.env
+++ b/comicvine-service.env
@@ -1,7 +1,7 @@
 LOGGER=true
 LOGLEVEL=info
 SERVICEDIR=dist/services
+PWD=./
 TRANSPORTER=nats://nats:4222
 CACHER=Memory
-COMICVINE_API_KEY=a5fa0663683df8145a85d694b5da4b87e1c92c69
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dd3e5b5..749f280 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,7 +39,8 @@ services:
       - ${USERDATA_DIRECTORY}:/comicvine-service/userdata
     environment:
       SERVICES: api
-    env_file: services.env
+      COMICVINE_API_KEY: ${COMICVINE_API_KEY}
+    env_file: comicvine-service.env
     depends_on:
       - nats
     networks:
@@ -55,7 +56,7 @@ services:
     volumes:
       - ${COMICS_DIRECTORY}:/comicvine-service/comics
       - ${USERDATA_DIRECTORY}:/comicvine-service/userdata
-    env_file: services.env
+    env_file: comicvine-service.env
     networks:
       - proxy
   
@@ -69,10 +70,8 @@ services:
       - "3001:3001"
     environment:
       SERVICES: api
-      MONGO_URI: mongodb://db:27017/threetwo
-      REDIS_URI: redis://redis:6379
-      CALIBRE_EBOOK_META_PATH: /opt/calibre/ebook-meta
-    env_file: services.env
+      COMICVINE_API_KEY: ${COMICVINE_API_KEY}
+    env_file: threetwo-import-service.env
     volumes:
       - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
       - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
@@ -95,7 +94,7 @@ services:
     volumes:
       - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
       - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
-    env_file: services.env
+    env_file: threetwo-import-service.env
     networks:
       - proxy
   
@@ -112,7 +111,7 @@ services:
       - nats
     environment:
       SERVICES: imagetransformation 
-    env_file: services.env
+    env_file: threetwo-import-service.env
     networks:
       - proxy
   
@@ -129,7 +128,7 @@ services:
       - nats
     environment:
       SERVICES: libraryqueue 
-    env_file: services.env
+    env_file: threetwo-import-service.env
     networks:
       - proxy
 
diff --git a/services.env b/services.env
deleted file mode 100644
index f141c1e..0000000
--- a/services.env
+++ /dev/null
@@ -1,7 +0,0 @@
-LOGGER=true
-LOGLEVEL=info
-SERVICEDIR=dist/services
-COMICVINE_API_KEY=a5fa0663683df8145a85d694b5da4b87e1c92c69
-TRANSPORTER=nats://nats:4222
-CACHER=Memory
-
diff --git a/threetwo-import-service.env b/threetwo-import-service.env
new file mode 100644
index 0000000..544314b
--- /dev/null
+++ b/threetwo-import-service.env
@@ -0,0 +1,9 @@
+LOGGER=true
+LOGLEVEL=info
+SERVICEDIR=dist/services
+MONGO_URI=mongodb://db:27017/threetwo
+REDIS_URI=redis://redis:6379
+TRANSPORTER=nats://nats:4222
+CALIBRE_EBOOK_META_PATH=/opt/calibre/ebook-meta
+CACHER=Memory
+