diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32834b8ce1..e8cf1b62fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ Usage:
 * Fix #130: Updated HelmMojo documentation
 * Fix #138: dockerAccessRequired should be false in case of docker build strategy
 * Fix #131: Extra-artifact wrongly generated  
+* Ported PR fabric8io/fabric8-mavne-plugin#1810, Update Fabric8 Images to latest version
 
 ### 1.0.0-alpha-1 (2020-03-27)
 * Ported PR fabric8io/fabric8-maven-plugin#1792, NullCheck in FileDataSecretEnricher
diff --git a/jkube-kit/parent/pom.xml b/jkube-kit/parent/pom.xml
index dc4dd774f6..4b4cfb04e0 100644
--- a/jkube-kit/parent/pom.xml
+++ b/jkube-kit/parent/pom.xml
@@ -77,8 +77,8 @@
     <!-- =======================================================  -->
     <!-- === Java base image versions for docker, s2i (istag == s2i) -->
     <!-- Upstream -->
-    <version.image.java.upstream.docker>1.5</version.image.java.upstream.docker>
-    <version.image.java.upstream.s2i>2.3</version.image.java.upstream.s2i>
+    <version.image.java.upstream.docker>1.7</version.image.java.upstream.docker>
+    <version.image.java.upstream.s2i>3.0-java8</version.image.java.upstream.s2i>
 
     <!-- RedHat -->
     <version.image.java.redhat.docker>2.0</version.image.java.redhat.docker>
@@ -87,7 +87,7 @@
     <!-- =======================================================  -->
     <!-- === Karaf base image versions for docker, s2i (istag == s2i) -->
     <!-- Upstream -->
-    <version.image.karaf.upstream.docker>2.3</version.image.karaf.upstream.docker>
+    <version.image.karaf.upstream.docker>3.0</version.image.karaf.upstream.docker>
     <version.image.karaf.upstream.s2i>${version.image.karaf.upstream.docker}</version.image.karaf.upstream.s2i>
 
     <!-- RedHat  -->