diff --git a/Dockerfile b/Dockerfile
index 80889fd72..cd2e615f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,10 @@ RUN mvn clean install -P dockerfile-build
 ######################
 FROM wguopensource/osmt-base:latest
 
+ARG MVN_POM_VERSION
+
 COPY --chown=${USER}:${USER} ./import ${BASE_DIR}/import/
-COPY --from=build --chown=${USER}:${USER} ${BASE_DIR}/build/api/target/osmt-*.jar ${BASE_DIR}/bin/osmt.jar
+COPY --from=build --chown=${USER}:${USER} ${BASE_DIR}/build/api/target/osmt-api-${MVN_POM_VERSION}.jar ${BASE_DIR}/bin/osmt.jar
 
 ADD ./docker/ /${BASE_DIR}/
 
diff --git a/api/src/main/resources/config/application-dev.properties b/api/src/main/resources/config/application-dev.properties
index bf4b9f23a..412ede621 100644
--- a/api/src/main/resources/config/application-dev.properties
+++ b/api/src/main/resources/config/application-dev.properties
@@ -1,7 +1,7 @@
 db.showMissingCreateTableStatements=true
 
-app.baseDomain=localhost:8080
-app.baseUrl=http://localhost:8080
+app.baseDomain=${BASE_DOMAIN:-localhost:8080}
+app.baseUrl=${BASE_URL:-http://localhost:8080}
 
 # Spring Boot will serve frontend files via port 8080
 # If you are using ng serve to proxy static files built by Angular, set OSMT_FRONT_END_PORT to 4200