diff --git a/Jenkinsfile b/Jenkinsfile
index c7893df..c0e936e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,8 @@ pipeline {
         }
         stage('Build Environment') {
             steps {
-                script {    
+                script {
+    
                     docker.build("${DOCKER_IDENTITY}", '-f docker/Dockerfile-jenkins-php .')
                     docker.build("${DOCKER_IDENTITY_NGINX}", '-f docker/Dockerfile-nginx .')
                 }
@@ -67,6 +68,10 @@ pipeline {
                     docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-credentials') {
                         docker.image("${DOCKER_IDENTITY}").push()
                         docker.image("${DOCKER_IDENTITY_NGINX}").push()
+                        if (env.BRANCH_NAME == 'main') {
+                            docker.image("${DOCKER_IDENTITY}").push("latest")
+                            docker.image("${DOCKER_IDENTITY_NGINX}").push("latest")
+                        }
                     }
                 }
             }
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
new file mode 100644
index 0000000..8f04f0f
--- /dev/null
+++ b/docker-compose-deploy.yml
@@ -0,0 +1,51 @@
+services:
+  database:
+    container_name: ogcore-database
+    image: mariadb:10.11
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: ogcore
+      MYSQL_PASSWORD: root
+      MYSQL_USER: admin
+    ports:
+      - 3336:3306
+    volumes:
+      - database_data:/var/lib/mysql
+    networks:
+      - ogcore-network
+
+  nginx:
+    container_name: ogcore-nginx
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile-nginx
+    depends_on:
+      - php
+    ports:
+      - 8080:80
+    volumes:
+      - ./public:/var/www/html/public:cached
+    networks:
+      - ogcore-network
+    image: opengnsys/ogcore-nginx:static
+
+  php:
+    container_name: ogcore-php
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile-jenkins-php
+    depends_on:
+      - database
+    environment:
+      XDEBUG_CLIENT_HOST: 127.17.0.1
+      XDEBUG_CLIENT_PORT: 9003
+      PHP_IDE_CONFIG: serverName=ogcore
+    networks:
+      - ogcore-network
+    image: opengnsys/ogcore-php:static
+
+volumes:
+  database_data:
+
+networks:
+  ogcore-network:
diff --git a/src/Controller/UDS/OrganizationalUnitController.php b/src/Controller/UDS/OrganizationalUnitController.php
index 5767326..165add1 100644
--- a/src/Controller/UDS/OrganizationalUnitController.php
+++ b/src/Controller/UDS/OrganizationalUnitController.php
@@ -95,9 +95,7 @@ class OrganizationalUnitController extends AbstractController
 
         $images = $this->entityManager
             ->getRepository(Image::class)
-            ->findBy([
-                'organizationalUnit' => $parent,
-            ], ['name' => 'ASC']);
+            ->findAll();
 
         $data = [];