diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9b5a14..1e245ea 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/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -32,6 +34,8 @@ jobs:
 
     # send the coverage report to coveralls.io
     - name: Coveralls Report
+      # send it only from the TW build to avoid duplicate submits
+      if: ${{ matrix.distro == 'tumbleweed' }}
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -39,7 +43,7 @@ jobs:
   # FIXME: Rubocop is not used here
   # Rubocop:
   #   runs-on: ubuntu-latest
-  #   container: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby:latest
+  #   container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
 
   #   steps:
 
@@ -54,9 +58,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro:  [ "tumbleweed", "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -71,9 +77,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -90,9 +98,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
diff --git a/Rakefile b/Rakefile
index 44a694a..b6e03e7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,4 @@
 require "yast/rake"
 
-Yast::Tasks.submit_to :sle15sp5
-
 Yast::Tasks.configuration do |conf|
 end