diff --git a/docker-compose.atmo-test.yml b/docker-compose.atmo-test.yml
index 0a10169..316f86a 100644
--- a/docker-compose.atmo-test.yml
+++ b/docker-compose.atmo-test.yml
@@ -10,7 +10,7 @@ services:
       POSTGRES_PASSWORD: 'atmosphere_db_pass'
 
   atmosphere:
-    image: 'calvinmclean/atmosphere:latest'
+    image: 'cyverse/atmosphere:latest'
     entrypoint: '/root/test.sh'
     depends_on:
       - 'postgres'
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 2c11794..677c501 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -13,12 +13,12 @@ services:
       TROPO_DB_NAME: 'troposphere'
 
   atmosphere:
-    image: 'calvinmclean/atmosphere:latest'
+    image: 'cyverse/atmosphere:latest'
     depends_on:
       - 'postgres'
 
   troposphere:
-    image: 'calvinmclean/troposphere:latest'
+    image: 'cyverse/troposphere:latest'
     depends_on:
       - 'atmosphere'
     ports:
diff --git a/docker-compose.tropo-test.yml b/docker-compose.tropo-test.yml
index 79de5ef..58fb052 100644
--- a/docker-compose.tropo-test.yml
+++ b/docker-compose.tropo-test.yml
@@ -11,7 +11,7 @@ services:
       POSTGRES_DB: 'troposphere_db'
 
   troposphere:
-    image: 'calvinmclean/troposphere:latest'
+    image: 'cyverse/troposphere:latest'
     entrypoint: '/root/test.sh'
     depends_on:
       - 'postgres'
diff --git a/docker-compose.yml b/docker-compose.yml
index 56bc9f0..4fe125e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,8 @@ services:
       - '../atmosphere:/opt/dev/atmosphere'
       - '../atmosphere-ansible:/opt/dev/atmosphere-ansible'
       - '../atmosphere-docker-secrets:/opt/dev/atmosphere-docker-secrets'
+      - '/boot:/boot'
+      - '/lib/modules:/lib/modules'
     depends_on:
       - 'postgres'