diff --git a/docker-compose.yml b/docker-compose.yml
index f0a9ab7..fcd4174 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       SERVICES: api
     env_file: ./docker-env/comicvine-service.env
     volumes:
-      - './userdata:/comicvine-service/userdata'
+      - ${PWD}/userdata:/comicvine-service/userdata
     depends_on:
       - nats
     networks:
@@ -37,7 +37,7 @@ services:
     environment:
       SERVICES: comicvine 
     volumes:
-      - './userdata:/comicvine-service/userdata'
+      - ${PWD}/userdata:/comicvine-service/userdata
     env_file: ./docker-env/comicvine-service.env
     networks:
       - proxy
@@ -53,8 +53,8 @@ services:
       SERVICES: api
     env_file: ./docker-env/threetwo-import-service.env
     volumes:
-      - './userdata:/threetwo-import-service/userdata'
-      - './comics:/threetwo-import-service/comics'
+      - ${PWD}/userdata:/threetwo-import-service/userdata
+      - ${PWD}/comics:/threetwo-import-service/comics${PWD}
     depends_on:
       - nats
       - mongodb
@@ -72,8 +72,8 @@ services:
     environment:
       SERVICES: import 
     volumes:
-      - './userdata:/threetwo-import-service/userdata'
-      - './comics:/threetwo-import-service/comics'
+      - ${PWD}/userdata:/threetwo-import-service/userdata
+      - ${PWD}/comics:/threetwo-import-service/comics
     env_file: ./docker-env/threetwo-import-service.env
     networks:
       - proxy
@@ -84,8 +84,8 @@ services:
     image: frishi/threetwo-import-service
     container_name: image-transformation
     volumes:
-      - './userdata:/threetwo-import-service/userdata'
-      - './comics:/threetwo-import-service/comics'
+      - ${PWD}/userdata:/threetwo-import-service/userdata
+      - ${PWD}/comics:/threetwo-import-service/comics
     depends_on: 
       - mongodb 
       - nats
@@ -117,11 +117,11 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./proxy.conf:/etc/nginx/conf.d/default.conf 
+      - ${PWD}/proxy.conf:/etc/nginx/conf.d/default.conf 
   
   rabbitmq:
     image: 'bitnami/rabbitmq:latest'
-    container_name: jobs_queue
+    container_name: queue
 
 networks:
   proxy: