diff --git a/legend-engine-config/legend-engine-server/legend-engine-server-http-server/Dockerfile b/legend-engine-config/legend-engine-server/legend-engine-server-http-server/Dockerfile
deleted file mode 100644
index 30799d946ee..00000000000
--- a/legend-engine-config/legend-engine-server/legend-engine-server-http-server/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Goldman Sachs
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM eclipse-temurin:11.0.17_8-jdk-jammy
-COPY target/legend-engine-server-*.jar /app/bin/
-COPY src/main/resources/docker/config/config.json /config/config.json
-COPY src/main/resources/docker/config/vault.properties /config/vault.properties
-CMD java -cp /app/bin/*-shaded.jar \
--XX:+ExitOnOutOfMemoryError \
--XX:MaxRAMPercentage=60 \
--Xss4M \
--Dfile.encoding=UTF8 \
-org.finos.legend.engine.server.Server server /config/config.json
diff --git a/legend-engine-config/legend-engine-server/legend-engine-server-http-server/pom.xml b/legend-engine-config/legend-engine-server/legend-engine-server-http-server/pom.xml
index b35e3c50a2e..8c39ba4a5da 100644
--- a/legend-engine-config/legend-engine-server/legend-engine-server-http-server/pom.xml
+++ b/legend-engine-config/legend-engine-server/legend-engine-server-http-server/pom.xml
@@ -1269,24 +1269,49 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>dockerfile-maven-plugin</artifactId>
-                        <inherited>false</inherited>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <phase>deploy</phase>
+                                <phase>install</phase>
                                 <goals>
                                     <goal>build</goal>
-                                    <goal>tag</goal>
-                                    <goal>push</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <tag>${project.version}</tag>
-                            <username>${env.DOCKER_USERNAME}</username>
-                            <password>${env.DOCKER_PASSWORD}</password>
-                            <repository>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</repository>
+                            <from>
+                                <image>eclipse-temurin:11-jre</image>
+                            </from>
+                            <to>
+                                <tags>${project.version}</tags>
+                                <auth>
+                                    <username>${env.DOCKER_USERNAME}</username>
+                                    <password>${env.DOCKER_PASSWORD}</password>
+                                </auth>
+                                <image>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</image>
+                            </to>
+                            <container>
+                                <mainClass>org.finos.legend.engine.server.Server</mainClass>
+                                <args>
+                                    <arg>server</arg>
+                                    <arg>/config/config.json</arg>
+                                </args>
+                                <jvmFlags>
+                                    <jvmFlag>-XX:+ExitOnOutOfMemoryError</jvmFlag>
+                                    <jvmFlag>-XX:MaxRAMPercentage=60</jvmFlag>
+                                    <jvmFlag>-Xss4M</jvmFlag>
+                                    <jvmFlag>-Dfile.encoding=UTF8</jvmFlag>
+                                </jvmFlags>
+                            </container>
+                            <extraDirectories>
+                                <paths>
+                                    <path>
+                                        <from>src/main/resources/docker/config</from>
+                                        <into>/config</into>
+                                    </path>
+                                </paths>
+                            </extraDirectories>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -1297,24 +1322,98 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>dockerfile-maven-plugin</artifactId>
-                        <inherited>false</inherited>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <phase>install</phase>
                                 <goals>
                                     <goal>build</goal>
-                                    <goal>tag</goal>
-                                    <goal>push</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <tag>snapshot</tag>
-                            <username>${env.DOCKER_USERNAME}</username>
-                            <password>${env.DOCKER_PASSWORD}</password>
-                            <repository>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</repository>
+                            <from>
+                                <image>eclipse-temurin:11-jre</image>
+                            </from>
+                            <to>
+                                <tags>snapshot</tags>
+                                <auth>
+                                    <username>${env.DOCKER_USERNAME}</username>
+                                    <password>${env.DOCKER_PASSWORD}</password>
+                                </auth>
+                                <image>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</image>
+                            </to>
+                            <container>
+                                <mainClass>org.finos.legend.engine.server.Server</mainClass>
+                                <args>
+                                    <arg>server</arg>
+                                    <arg>/config/config.json</arg>
+                                </args>
+                                <jvmFlags>
+                                    <jvmFlag>-XX:+ExitOnOutOfMemoryError</jvmFlag>
+                                    <jvmFlag>-XX:MaxRAMPercentage=60</jvmFlag>
+                                    <jvmFlag>-Xss4M</jvmFlag>
+                                    <jvmFlag>-Dfile.encoding=UTF8</jvmFlag>
+                                </jvmFlags>
+                            </container>
+                            <extraDirectories>
+                                <paths>
+                                    <path>
+                                        <from>src/main/resources/docker/config</from>
+                                        <into>/config</into>
+                                    </path>
+                                </paths>
+                            </extraDirectories>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>docker-local</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>dockerBuild</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <from>
+                                <image>eclipse-temurin:11-jre</image>
+                            </from>
+                            <to>
+                                <tags>${project.version}-local</tags>
+                                <image>${project.artifactId}</image>
+                            </to>
+                            <container>
+                                <mainClass>org.finos.legend.engine.server.Server</mainClass>
+                                <args>
+                                    <arg>server</arg>
+                                    <arg>/config/config.json</arg>
+                                </args>
+                                <jvmFlags>
+                                    <jvmFlag>-XX:+ExitOnOutOfMemoryError</jvmFlag>
+                                    <jvmFlag>-XX:MaxRAMPercentage=60</jvmFlag>
+                                    <jvmFlag>-Xss4M</jvmFlag>
+                                    <jvmFlag>-Dfile.encoding=UTF8</jvmFlag>
+                                </jvmFlags>
+                            </container>
+                            <extraDirectories>
+                                <paths>
+                                    <path>
+                                        <from>src/main/resources/docker/config</from>
+                                        <into>/config</into>
+                                    </path>
+                                </paths>
+                            </extraDirectories>
                         </configuration>
                     </plugin>
                 </plugins>
diff --git a/legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/Dockerfile b/legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/Dockerfile
deleted file mode 100644
index f9403d7bbd1..00000000000
--- a/legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Goldman Sachs
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM eclipse-temurin:11.0.17_8-jdk-jammy
-COPY target/legend-engine-pure-ide-light-*.jar /app/bin/
-COPY src/main/resources/ideLightConfig.json /config/config.json
-CMD java -cp /app/bin/*-shaded.jar \
--XX:+ExitOnOutOfMemoryError \
--XX:MaxRAMPercentage=60 \
--Xss4M \
--Dfile.encoding=UTF8 \
-org.finos.legend.engine.ide.PureIDELight_NoExtension server /config/config.json
diff --git a/legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/pom.xml b/legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/pom.xml
index e2388e1aa78..85ac5158ba6 100644
--- a/legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/pom.xml
+++ b/legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/pom.xml
@@ -454,24 +454,50 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>dockerfile-maven-plugin</artifactId>
-                        <inherited>false</inherited>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <phase>deploy</phase>
+                                <phase>install</phase>
                                 <goals>
                                     <goal>build</goal>
-                                    <goal>tag</goal>
-                                    <goal>push</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <tag>${project.version}</tag>
-                            <username>${env.DOCKER_USERNAME}</username>
-                            <password>${env.DOCKER_PASSWORD}</password>
-                            <repository>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</repository>
+                            <from>
+                                <image>eclipse-temurin:11-jre</image>
+                            </from>
+                            <to>
+                                <tags>${project.version}</tags>
+                                <auth>
+                                    <username>${env.DOCKER_USERNAME}</username>
+                                    <password>${env.DOCKER_PASSWORD}</password>
+                                    <image>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</image>
+                                </auth>
+                            </to>
+                            <container>
+                                <mainClass>org.finos.legend.engine.ide.PureIDELight_NoExtension</mainClass>
+                                <args>
+                                    <arg>server</arg>
+                                    <arg>/config/ideLightConfig.json</arg>
+                                </args>
+                                <jvmFlags>
+                                    <jvmFlag>-XX:+ExitOnOutOfMemoryError</jvmFlag>
+                                    <jvmFlag>-XX:MaxRAMPercentage=60</jvmFlag>
+                                    <jvmFlag>-Xss4M</jvmFlag>
+                                    <jvmFlag>-Dfile.encoding=UTF8</jvmFlag>
+                                </jvmFlags>
+                            </container>
+                            <extraDirectories>
+                                <paths>
+                                    <path>
+                                        <from>src/main/resources</from>
+                                        <into>/config</into>
+                                        <includes>ideLightConfig.json</includes>
+                                    </path>
+                                </paths>
+                            </extraDirectories>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -482,24 +508,100 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>dockerfile-maven-plugin</artifactId>
-                        <inherited>false</inherited>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <phase>install</phase>
                                 <goals>
                                     <goal>build</goal>
-                                    <goal>tag</goal>
-                                    <goal>push</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <tag>snapshot</tag>
-                            <username>${env.DOCKER_USERNAME}</username>
-                            <password>${env.DOCKER_PASSWORD}</password>
-                            <repository>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</repository>
+                            <from>
+                                <image>eclipse-temurin:11-jre</image>
+                            </from>
+                            <to>
+                                <tags>snapshot</tags>
+                                <auth>
+                                    <username>${env.DOCKER_USERNAME}</username>
+                                    <password>${env.DOCKER_PASSWORD}</password>
+                                </auth>
+                                <image>registry.hub.docker.com/${env.DOCKER_USERNAME}/${project.artifactId}</image>
+                            </to>
+                            <container>
+                                <mainClass>org.finos.legend.engine.ide.PureIDELight_NoExtension</mainClass>
+                                <args>
+                                    <arg>server</arg>
+                                    <arg>/config/ideLightConfig.json</arg>
+                                </args>
+                                <jvmFlags>
+                                    <jvmFlag>-XX:+ExitOnOutOfMemoryError</jvmFlag>
+                                    <jvmFlag>-XX:MaxRAMPercentage=60</jvmFlag>
+                                    <jvmFlag>-Xss4M</jvmFlag>
+                                    <jvmFlag>-Dfile.encoding=UTF8</jvmFlag>
+                                </jvmFlags>
+                            </container>
+                            <extraDirectories>
+                                <paths>
+                                    <path>
+                                        <from>src/main/resources</from>
+                                        <into>/config</into>
+                                        <includes>ideLightConfig.json</includes>
+                                    </path>
+                                </paths>
+                            </extraDirectories>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>docker-local</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>dockerBuild</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <from>
+                                <image>eclipse-temurin:11-jre</image>
+                            </from>
+                            <to>
+                                <tags>${project.version}-local</tags>
+                                <image>${project.artifactId}</image>
+                            </to>
+                            <container>
+                                <mainClass>org.finos.legend.engine.ide.PureIDELight_NoExtension</mainClass>
+                                <args>
+                                    <arg>server</arg>
+                                    <arg>/config/ideLightConfig.json</arg>
+                                </args>
+                                <jvmFlags>
+                                    <jvmFlag>-XX:+ExitOnOutOfMemoryError</jvmFlag>
+                                    <jvmFlag>-XX:MaxRAMPercentage=60</jvmFlag>
+                                    <jvmFlag>-Xss4M</jvmFlag>
+                                    <jvmFlag>-Dfile.encoding=UTF8</jvmFlag>
+                                </jvmFlags>
+                            </container>
+                            <extraDirectories>
+                                <paths>
+                                    <path>
+                                        <from>src/main/resources</from>
+                                        <into>/config</into>
+                                        <includes>ideLightConfig.json</includes>
+                                    </path>
+                                </paths>
+                            </extraDirectories>
                         </configuration>
                     </plugin>
                 </plugins>
diff --git a/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml b/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml
index 2ee52c3c684..04ff900f5b5 100644
--- a/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml
+++ b/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml
@@ -523,15 +523,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>com.google.cloud.tools</groupId>
-                    <artifactId>jib-maven-plugin</artifactId>
-                    <version>3.4.3</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 0d14ac332ed..df97f18be87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,7 +221,7 @@
         <!-- Plugin versions -->
         <build-helper.maven.plugin.version>3.2.0</build-helper.maven.plugin.version>
         <depgraph-maven-plugin.version>4.0.2</depgraph-maven-plugin.version>
-        <dockerfile.maven.plugin.version>1.4.13</dockerfile.maven.plugin.version>
+        <jib-maven-plugin.version>3.5.1</jib-maven-plugin.version>
         <exec.maven.plugin.version>3.0.0</exec.maven.plugin.version>
         <jacoco.maven.plugin.version>0.8.10</jacoco.maven.plugin.version>
         <maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
@@ -371,9 +371,9 @@
                     <version>${build-helper.maven.plugin.version}</version>
                 </plugin>
                 <plugin>
-                    <groupId>com.spotify</groupId>
-                    <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>${dockerfile.maven.plugin.version}</version>
+                    <groupId>com.google.cloud.tools</groupId>
+                    <artifactId>jib-maven-plugin</artifactId>
+                    <version>${jib-maven-plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.finos.legend.pure</groupId>
@@ -4240,21 +4240,6 @@
 
 
     <profiles>
-        <profile>
-            <id>docker</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>dockerfile-maven-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>generate-protocol-version</id>
             <properties>