diff --git a/devenv/docker/blocks/multiple-openldap/ldap-server/Dockerfile b/devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile
similarity index 74%
rename from devenv/docker/blocks/multiple-openldap/ldap-server/Dockerfile
rename to devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile
index 979d01c7dad..29e581d2b13 100644
--- a/devenv/docker/blocks/multiple-openldap/ldap-server/Dockerfile
+++ b/devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile
@@ -19,11 +19,11 @@ EXPOSE 389
 
 VOLUME ["/etc/ldap", "/var/lib/ldap"]
 
-COPY modules/ /etc/ldap.dist/modules
-COPY prepopulate/ /etc/ldap.dist/prepopulate
+COPY admins-ldap-server/modules/ /etc/ldap.dist/modules
+COPY admins-ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
 
-COPY ../entrypoint.sh /entrypoint.sh
-COPY ../prepopulate.sh /prepopulate.sh
+COPY ./entrypoint.sh /entrypoint.sh
+COPY ./prepopulate.sh /prepopulate.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
 
diff --git a/devenv/docker/blocks/multiple-openldap/docker-compose.yaml b/devenv/docker/blocks/multiple-openldap/docker-compose.yaml
index 74f5d29a90f..7ed0ca2e840 100644
--- a/devenv/docker/blocks/multiple-openldap/docker-compose.yaml
+++ b/devenv/docker/blocks/multiple-openldap/docker-compose.yaml
@@ -1,5 +1,7 @@
   admins-openldap:
-    build: docker/blocks/multiple-openldap/admins-ldap-server
+    build: 
+      context: docker/blocks/multiple-openldap
+      dockerfile: ./admins-ldap-server.Dockerfile
     environment:
       SLAPD_PASSWORD: grafana
       SLAPD_DOMAIN: grafana.org
@@ -8,7 +10,9 @@
       - "389:389"
 
   openldap:
-    build: docker/blocks/multiple-openldap/ldap-server
+    build: 
+      context: docker/blocks/multiple-openldap
+      dockerfile: ./ldap-server.Dockerfile
     environment:
       SLAPD_PASSWORD: grafana
       SLAPD_DOMAIN: grafana.org
diff --git a/devenv/docker/blocks/multiple-openldap/admins-ldap-server/Dockerfile b/devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile
similarity index 75%
rename from devenv/docker/blocks/multiple-openldap/admins-ldap-server/Dockerfile
rename to devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile
index 979d01c7dad..7604d1118a3 100644
--- a/devenv/docker/blocks/multiple-openldap/admins-ldap-server/Dockerfile
+++ b/devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile
@@ -19,11 +19,11 @@ EXPOSE 389
 
 VOLUME ["/etc/ldap", "/var/lib/ldap"]
 
-COPY modules/ /etc/ldap.dist/modules
-COPY prepopulate/ /etc/ldap.dist/prepopulate
+COPY ldap-server/modules/ /etc/ldap.dist/modules
+COPY ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
 
-COPY ../entrypoint.sh /entrypoint.sh
-COPY ../prepopulate.sh /prepopulate.sh
+COPY ./entrypoint.sh /entrypoint.sh
+COPY ./prepopulate.sh /prepopulate.sh
 
 ENTRYPOINT ["/entrypoint.sh"]