diff --git a/roles/svc-db-openldap/config/main.yml b/roles/svc-db-openldap/config/main.yml
index 6a37e611..0fa1b762 100644
--- a/roles/svc-db-openldap/config/main.yml
+++ b/roles/svc-db-openldap/config/main.yml
@@ -5,7 +5,7 @@ network:
 docker: 
   services:
     openldap:     
-      image:      "bitnami/openldap"
+      image:      "bitnamilegacy/openldap"
       name:       "openldap"
       version:    "latest"
   network:        "openldap"
diff --git a/roles/web-app-moodle/config/main.yml b/roles/web-app-moodle/config/main.yml
index b796ebef..3402fa30 100644
--- a/roles/web-app-moodle/config/main.yml
+++ b/roles/web-app-moodle/config/main.yml
@@ -33,7 +33,7 @@ docker:
       enabled:        true
     moodle:
       version:        "4.5" # Latest LTS - Necessary for OIDC
-      image:          bitnami/moodle
+      image:          bitnamilegacy/moodle
       name:           moodle
   volumes:
     data:             moodle_data