diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 3549935..02bc07f 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./
-          file: ./Dockerfile-Java-11
+          file: ./Dockerfile
           platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: norstella/oxalis-as4:6.0.0-latest-java11
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index c08fb7a..df27095 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -61,7 +61,7 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./
-          file: ./Dockerfile-Java-11
+          file: ./Dockerfile
           platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: norstella/oxalis-as4:6.0.0
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5e8a2fb..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: java
-jdk:
-- openjdk8
-install:
-- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pdist
-script:
-- mvn test -B
-- mvn javadoc:javadoc -B
-cache:
-  directories:
-  - "$HOME/.m2/repository"
-deploy:
-  provider: releases
-  api_key:
-    secure: pMbJBLrONQy+nqjH5bsto88NHYFtHNqM/bVbGgTO29xIM24qCRgGd03rxW9/MZbmkc6RzyAFyhI3sx98WtuQn0xDFYUqwGLggIgUyWdKNQMT1RQcrTMWoNOw6JYTYfdES6VwxkzzHei+7JwpQ8dsC8uZY9hf1sWMVyx7M3uqfcm7ThHB0AsB0uLtq7G4hovrF/MzM2JKFiV7NuPKtgPMdDJ6mH0L3Nsxd7h5yt/g5PNUuKgqqft2dAmuLZ6evZaB9j5nSe9qWANjVyHpzabcPZYNzMSU3szHkY+mq/SLurnYAe34GCUKWsZpeouJSiUnCB1qJIv0EThnSVibIwYxPeJp+P4LL7EttlnxsVA9c7PJ3jhyLSwYZ0nc3gSMvNme7if7231tS9/KbSlp57sdp7FFDsi1NSB7pdVqwNfv6rrIIFYR793nz9Ii4caA1zog/VGbbglkoZXTFC4G3njjRSJg691LtgoCn9w66nazv2MN1rn0oUzbPkWIxi/d5M767VQi+OZzClZDxh1g407sEQ5SMm2Ux9fk9VQrhgL3e7e769sahGW1jCi9b89LyhfkNNnfyeEiXfWR5TeWsCHBo/djCOfhdRg/9A7xeAkVpFyAvsoOYE7rMCrIcHZ/e6rnpN1fb1YeFYuvSEFpTN1542mtCyRNHCi5m/jnptvu/gI=
-  file_glob: true
-  file: '**/target/*.{zip,tar.gz}'
-  skip_cleanup: true
-  on:
-    tags: true
diff --git a/Dockerfile b/Dockerfile
index b5f74af..35f603d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.3.9-jdk-8 AS mvn
+FROM maven:3.8.6-jdk-11 AS mvn
 
 ADD . $MAVEN_HOME
 
@@ -7,6 +7,6 @@ RUN cd $MAVEN_HOME \
  && cp -r target/$(ls target | grep "\-dist$" | head -1) /dist
 
 
-FROM norstella/oxalis:latest
+norstella/oxalis:6.0.0
 
 COPY --from=mvn /dist /oxalis/ext
\ No newline at end of file
diff --git a/Dockerfile-Java-11 b/Dockerfile-Java-11
deleted file mode 100644
index d5584dc..0000000
--- a/Dockerfile-Java-11
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM maven:3.8.6-jdk-11 AS mvn
-
-ADD . $MAVEN_HOME
-
-RUN cd $MAVEN_HOME \
- && mvn -B clean package -DskipTests=true \
- && cp -r target/$(ls target | grep "\-dist$" | head -1) /dist
-
-
-FROM norstella/oxalis:latest-11
-
-COPY --from=mvn /dist /oxalis/ext
\ No newline at end of file