diff --git a/modules/services/mailcow.tf b/modules/services/mailcow.tf
index 9cf00bd..4cfee2d 100644
--- a/modules/services/mailcow.tf
+++ b/modules/services/mailcow.tf
@@ -10,6 +10,7 @@ resource "mailcow_mailbox" "services" {
   full_name   = each.value.mail
   local_part  = each.value.mail
   password    = random_password.mailcow_service_passwords[each.key].result
+  force_pw_update = false
   imap_access = false
   pop3_access = false
   sogo_access = false
diff --git a/playbooks/roles/forgejo/vars/main.yml b/playbooks/roles/forgejo/vars/main.yml
index 33403ee..6257dc8 100644
--- a/playbooks/roles/forgejo/vars/main.yml
+++ b/playbooks/roles/forgejo/vars/main.yml
@@ -13,9 +13,9 @@ forgejo_svc:
 forgejo_env:
   FORGEJO__database__DB_TYPE: postgres
   FORGEJO__database__HOST: "{{ svc.db.host }}:{{ svc.db.port }}"
-  FORGEJO__database__NAME: "{{ opentofu.postgresql_service_roles.forgejo.database }}"
-  FORGEJO__database__USER: "{{ opentofu.postgresql_service_roles.forgejo.user }}"
-  FORGEJO__database__PASSWD: "{{ opentofu.postgresql_service_roles.forgejo.pass }}"
+  FORGEJO__database__NAME: "{{ opentofu.postgresql_data.forgejo.database }}"
+  FORGEJO__database__USER: "{{ opentofu.postgresql_data.forgejo.user }}"
+  FORGEJO__database__PASSWD: "{{ opentofu.postgresql_data.forgejo.pass }}"
   FORGEJO__database__SSL_MODE: verify-full
 
   FORGEJO__repository__ENABLE_PUSH_CREATE_USER: true
@@ -52,7 +52,7 @@ forgejo_env:
   FORGEJO__mailer__ENABLED: true
   FORGEJO__mailer__PROTOCOL: smtp+starttls
   FORGEJO__mailer__SMTP_ADDR: "{{ mailer.host }}"
-  FORGEJO__mailer__SMTP_PORT: "{{ mailer.post }}"
+  FORGEJO__mailer__SMTP_PORT: "{{ mailer.port }}"
   FORGEJO__mailer__FROM: "git <{{ opentofu.mailcow_data.forgejo.address }}>"
   FORGEJO__mailer__USER: "{{ opentofu.mailcow_data.forgejo.address }}"
   FORGEJO__mailer__PASSWD: "{{ opentofu.mailcow_data.forgejo.password }}"
diff --git a/playbooks/roles/homebox/vars/main.yml b/playbooks/roles/homebox/vars/main.yml
index 3eecfed..3929cc0 100644
--- a/playbooks/roles/homebox/vars/main.yml
+++ b/playbooks/roles/homebox/vars/main.yml
@@ -14,7 +14,7 @@ homebox_env:
 
 homebox_compose:
   watchtower: update
-  image: ghcr.io/hay-kot/homebox:latest-rootless
+  image: ghcr.io/sysadminsmedia/homebox:latest-rootless
   volumes:
     - data:/data
   file:
diff --git a/playbooks/roles/watchtower/files/run-once.sh b/playbooks/roles/watchtower/files/run-once.sh
index 535100a..5593232 100644
--- a/playbooks/roles/watchtower/files/run-once.sh
+++ b/playbooks/roles/watchtower/files/run-once.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-docker compose run -e WATCHTOWER_RUN_ONCE=true -e WATCHTOWER_NOTIFICATIONS= watchtower
+docker compose run --rm -e WATCHTOWER_RUN_ONCE=true app