diff --git a/group_vars/all b/group_vars/all
index e440d97a..fc3f3742 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -125,6 +125,7 @@ domain_akaunting:               "accounting.{{top_domain}}"
 domain_attendize:               "tickets.{{top_domain}}"
 domain_baserow:                 "baserow.{{top_domain}}"
 domain_bigbluebutton:           "meet.{{top_domain}}"
+domain_bluesky:                 "bluesky.{{top_domain}}"
 domain_discourse:               "forum.{{top_domain}}"
 domain_elk:                     "elk.{{top_domain}}"
 domain_friendica:               "friendica.{{top_domain}}"
diff --git a/roles/docker-bluesky/tasks/main.yml b/roles/docker-bluesky/tasks/main.yml
index 452e6d50..d094785c 100644
--- a/roles/docker-bluesky/tasks/main.yml
+++ b/roles/docker-bluesky/tasks/main.yml
@@ -8,3 +8,7 @@
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
   notify: docker compose project setup
+
+- name: configure run.env
+  template: src=env.j2 dest={{docker_compose_instance_directory}}/env
+  notify: docker compose project setup
diff --git a/roles/docker-bluesky/templates/docker-compose.yml.j2 b/roles/docker-bluesky/templates/docker-compose.yml.j2
index 9f1f690c..7ba4deda 100644
--- a/roles/docker-bluesky/templates/docker-compose.yml.j2
+++ b/roles/docker-bluesky/templates/docker-compose.yml.j2
@@ -1,61 +1,21 @@
 services:
-  pds:
-    container_name: pds
+  application:
     image: ghcr.io/bluesky-social/pds:0.4
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
     ports:
-      - 3000:3000
+      - {{http_port}}:3000
     volumes:
-        - path/to/pds/storage:/pds
+        - data:/pds
     env_file:
-      - /path/to/pds.env
-
-version: "3.8"
-
-services:
-  pds:
-    image: bluesky-social/pds:latest
-    container_name: bluesky_pds
-    restart: always
-    ports:
-      - "80:80"
-      - "443:443"
+      - /env
     environment:
       # Geben Sie hier Ihre Domain und Konfigurationsdetails an
       PDS_HOSTNAME: "your-domain.com"
       PDS_ADMIN_EMAIL: "admin@your-domain.com"
       PDS_DB__POSTGRES__URL: "postgres://pdsuser:pdspassword@postgres:5432/pds"
       PDS_SERVICE_DID: "did:web:your-domain.com"
-    volumes:
-      - data:/data
-{% include 'templates/docker/services/' + database_type + '.yml.j2' %}
-
-  application:
-    logging:
-      driver: journald
-    restart: {{docker_restart_policy}}
-    image: gitea/gitea:latest
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - DB_TYPE=mysql
-      - DB_HOST={{database_host}}:3306
-      - DB_NAME={{database_name}}
-      - DB_USER={{database_username}}
-      - DB_PASSWD={{database_password}}
-      - SSH_PORT={{ssh_port}}
-      - SSH_LISTEN_PORT=22
-      - DOMAIN={{domain}}
-      - SSH_DOMAIN={{domain}}
-      - RUN_MODE="{{run_mode}}"
-      - ROOT_URL="https://{{domain}}/"
     ports:
       - "127.0.0.1:{{http_port}}:3000"
-      - "{{ssh_port}}:22"
-    volumes:
-      - data:/data
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1:3000"]
       interval: 1m
@@ -64,6 +24,8 @@ services:
 {% include 'templates/docker/container/networks.yml.j2' %}
 {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
 
+{% include 'templates/docker/services/' + database_type + '.yml.j2' %}
+
 {% include 'templates/docker/compose/volumes.yml.j2' %}
   data:
 
diff --git a/roles/docker-bluesky/templates/pds.env b/roles/docker-bluesky/templates/env.j2
similarity index 85%
rename from roles/docker-bluesky/templates/pds.env
rename to roles/docker-bluesky/templates/env.j2
index 56c43363..136977a0 100644
--- a/roles/docker-bluesky/templates/pds.env
+++ b/roles/docker-bluesky/templates/env.j2
@@ -1,11 +1,11 @@
-PDS_HOSTNAME= #bluesky.yourdomain.com
+PDS_HOSTNAME= {{domain}}
 PDS_JWT_SECRET= #openssl rand --hex 16
 PDS_ADMIN_PASSWORD= #openssl rand --hex 16
 PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX= #openssl ecparam --name secp256k1 --genkey --noout --outform DER | tail --bytes=+8 | head --bytes=32 | xxd --plain --cols 32
 PDS_EMAIL_SMTP_URL= #smtp://username@gmail.com:password@smtp.gmail.com:587
-PDS_EMAIL_FROM_ADDRESS= #admin@domain.com
+PDS_EMAIL_FROM_ADDRESS= {{administrator_email}}
 PDS_MODERATION_EMAIL_SMTP_URL= #smtp://username@gmail.com:password@smtp.gmail.com:587
-PDS_MODERATION_EMAIL_ADDRESS= #admin@domain.com
+PDS_MODERATION_EMAIL_ADDRESS= {{administrator_email}}
 PDS_DATA_DIRECTORY=/pds
 PDS_BLOBSTORE_DISK_LOCATION=/pds/blocks
 PDS_DID_PLC_URL=https://plc.directory