diff --git a/puppet/docker-compose.yml b/puppet/docker-compose.yml
index 47078ac..dbf52e3 100644
--- a/puppet/docker-compose.yml
+++ b/puppet/docker-compose.yml
@@ -3,26 +3,25 @@ version: "3.8"
 services:
   puppetserver:
     image: puppet/puppetserver:latest
-    container_name: puppet
-    hostname: puppet
+    container_name: puppetserver
+    hostname: active.home.lan
     ports:
       - "8140:8140"
     environment:
-      - PUPPETSERVER_HOSTNAME=puppetserver
-    networks:
-      - puppetnet
+      - PUPPETSERVER_HOSTNAME=active.home.lan
+    volumes:
+      # Main Puppet config
+      - ./puppetserver:/etc/puppetlabs/puppet
+
+      # Puppet code (manifests, modules)
+      - ./puppetserver/code:/etc/puppetlabs/code
 
-  puppetagent:
-    image: puppet/puppet-agent:latest
-    container_name: puppetagent
-    hostname: puppetagent
-    depends_on:
-      - puppetserver
-    environment:
-      - PUPPET_SERVER=puppetserver
     networks:
-      - puppetnet
-    tty: true
+      puppetnet:
+        aliases:
+          - puppet
+          - puppetserver
+          - active.home.lan
 
 networks:
   puppetnet:
\ No newline at end of file