diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d51302889..49116a327 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,9 +11,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro:  [ "tumbleweed", "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp4/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -43,9 +45,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp4/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -60,9 +64,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro:  [ "tumbleweed", "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp4/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -77,9 +83,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp4/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -96,9 +104,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp4/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
diff --git a/Rakefile b/Rakefile
index 5ea5f716b..70c3899c1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,5 @@
 require "yast/rake"
 
-Yast::Tasks.submit_to :sle15sp4
-
 AUTOINST_DIR = Packaging::Configuration::DESTDIR + "/usr/share/autoinstall/"
 
 Yast::Tasks.configuration do |conf|