diff --git a/openig-docker/Dockerfile b/openig-docker/Dockerfile
index dac9efa2..44dcb619 100644
--- a/openig-docker/Dockerfile
+++ b/openig-docker/Dockerfile
@@ -1,31 +1,30 @@
 FROM tomcat:9-jre21
 
-MAINTAINER Open Identity Platform Community <open-identity-platform-openig@googlegroups.com>
+LABEL org.opencontainers.image.authors="Open Identity Platform Community"
 
-ARG VERSION @project_version@
+ARG VERSION
 
 ENV CATALINA_HOME=/usr/local/tomcat
 ENV OPENIG_USER="openig"
 ENV OPENIG_BASE=/var/openig
 ENV PATH=$CATALINA_HOME/bin:$PATH
-ENV MEMORY="-server -XX:+UseG1GC -XX:+UseContainerSupport"
+ENV MEMORY="-server"
 ENV CATALINA_OPTS="$MEMORY"
 
-WORKDIR $CATALINA_HOME
 
-RUN apt-get update && apt-get install -y wget unzip \
-    && wget --quiet https://github.com/OpenIdentityPlatform/OpenIG/releases/download/$VERSION/OpenIG-$VERSION.war \
+RUN apt-get update && apt-get install -y curl unzip \
     && rm -fr $CATALINA_HOME/webapps/* \
-    && mv *.war $CATALINA_HOME/webapps/ROOT.war \
+    && if [ -z "$VERSION" ] ; then VERSION="$(curl -i -o - --silent https://api.github.com/repos/OpenIdentityPlatform/OpenIG/releases/latest | grep -m1 "\"name\"" | cut -d\" -f4)"; fi \
+    && curl -L https://github.com/OpenIdentityPlatform/OpenIG/releases/download/$VERSION/OpenIG-$VERSION.war --output $CATALINA_HOME/webapps/ROOT.war  \
     && useradd -m -r -u 1001 -g root $OPENIG_USER \
     && install -d -o $OPENIG_USER $OPENIG_BASE \
     && chown -R $OPENIG_USER:root $CATALINA_HOME \
-    &&  apt-get remove -y --purge unzip && rm -rf /var/lib/apt/lists/* \
-    &&  sed -i '/<\/Host>/i \ \ \ \ <Valve className=\"org.apache.catalina.valves.RemoteIpValve\" httpServerPort=\"8080\" httpsServerPort=\"443\" />' $CATALINA_HOME/conf/server.xml
+    && apt-get remove -y --purge unzip && rm -rf /var/lib/apt/lists/* \
+    && sed -i '/<\/Host>/i \ \ \ \ <Valve className=\"org.apache.catalina.valves.RemoteIpValve\" httpServerPort=\"8080\" httpsServerPort=\"443\" />' $CATALINA_HOME/conf/server.xml
 
 USER $OPENIG_USER
 
-EXPOSE 8080 
+EXPOSE 8080/tcp
 
 HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD curl -v -L --fail http://localhost:8080/openig/ || exit 1
  
diff --git a/openig-docker/Dockerfile-alpine b/openig-docker/Dockerfile-alpine
index 738823c3..8b31c3ec 100644
--- a/openig-docker/Dockerfile-alpine
+++ b/openig-docker/Dockerfile-alpine
@@ -1,8 +1,8 @@
 FROM tomcat:9-jre8-alpine
 
-MAINTAINER Open Identity Platform Community <open-identity-platform-openig@googlegroups.com>
+LABEL org.opencontainers.image.authors="Open Identity Platform Community"
 
-ARG VERSION @project_version@
+ARG VERSION
 
 ENV CATALINA_HOME=/usr/local/tomcat
 ENV OPENIG_USER="openig"
@@ -11,20 +11,19 @@ ENV PATH=$CATALINA_HOME/bin:$PATH
 ENV MEMORY="-server -XX:+UseG1GC -XX:+UseContainerSupport"
 ENV CATALINA_OPTS="$MEMORY"
 
-WORKDIR $CATALINA_HOME
-
 RUN apk add --update --no-cache --virtual curl builddeps unzip bash && apk upgrade --update --no-cache \
  && rm -rf  $CATALINA_HOME/webapps/* \
+ && if [ -z "$VERSION" ] ; then VERSION="$(curl -i -o - --silent https://api.github.com/repos/OpenIdentityPlatform/OpenIG/releases/latest | grep -m1 "\"name\"" | cut -d\" -f4)"; fi \
  && curl -L https://github.com/OpenIdentityPlatform/OpenIG/releases/download/$VERSION/OpenIG-$VERSION.war --output $CATALINA_HOME/webapps/ROOT.war  \
  && adduser -S -u 1001 -G root $OPENIG_USER \
  && install -d -o $OPENIG_USER $OPENIG_BASE \
- && chown -R $OPENIG_USER $CATALINA_HOME/webapps \
+ && chown -R $OPENIG_USER $CATALINA_HOME \
  && apk del unzip && rm -rf /var/cache/apk/* \
- &&  sed -i '/<\/Host>/i \ \ \ \ <Valve className=\"org.apache.catalina.valves.RemoteIpValve\" httpServerPort=\"8080\" httpsServerPort=\"443\" />' $CATALINA_HOME/conf/server.xml
+ && sed -i '/<\/Host>/i \ \ \ \ <Valve className=\"org.apache.catalina.valves.RemoteIpValve\" httpServerPort=\"8080\" httpsServerPort=\"443\" />' $CATALINA_HOME/conf/server.xml
 
 USER $OPENIG_USER
 
-EXPOSE 8080 
+EXPOSE 8080/tcp
 
 HEALTHCHECK --interval=30s --timeout=30s --start-period=1s --retries=3 CMD curl -v -L --fail http://localhost:8080/openig/ || exit 1