diff --git a/.ci-local/base3-15.set b/.ci-local/base3-15.set
deleted file mode 100644
index 96ba165a2..000000000
--- a/.ci-local/base3-15.set
+++ /dev/null
@@ -1,9 +0,0 @@
-MODULES="sncseq sscan calc ipac"
-
-BASE=3.15
-BASE_RECURSIVE=no
-
-SNCSEQ=R2-2-8
-SSCAN=R2-11-3
-CALC=R3-7-3
-IPAC=2.15
diff --git a/.ci-local/deps-latest.set b/.ci-local/deps-latest.set
new file mode 100644
index 000000000..4a2a26378
--- /dev/null
+++ b/.ci-local/deps-latest.set
@@ -0,0 +1,8 @@
+MODULES="sncseq sscan calc ipac"
+
+BASE_RECURSIVE=no
+
+SNCSEQ=master
+SSCAN=master
+CALC=master
+IPAC=master
diff --git a/.ci-local/base3-14.set b/.ci-local/deps1.set
similarity index 91%
rename from .ci-local/base3-14.set
rename to .ci-local/deps1.set
index 30ea3cb97..34dc30a23 100644
--- a/.ci-local/base3-14.set
+++ b/.ci-local/deps1.set
@@ -1,6 +1,5 @@
 MODULES="sncseq sscan calc ipac"
 
-BASE=3.14
 BASE_RECURSIVE=no
 
 SNCSEQ=R2-2-8
diff --git a/.ci-local/base7.set b/.ci-local/deps2.set
similarity index 91%
rename from .ci-local/base7.set
rename to .ci-local/deps2.set
index 87fd380d1..6f0fcae98 100644
--- a/.ci-local/base7.set
+++ b/.ci-local/deps2.set
@@ -1,6 +1,5 @@
 MODULES="sncseq sscan calc ipac"
 
-BASE=7.0
 BASE_RECURSIVE=no
 
 SNCSEQ=R2-2-8
diff --git a/.ci-local/no-deps.set b/.ci-local/no-deps.set
new file mode 100644
index 000000000..45d901f82
--- /dev/null
+++ b/.ci-local/no-deps.set
@@ -0,0 +1,3 @@
+MODULES=""
+
+BASE_RECURSIVE=no
diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml
index ab4b91ed2..f0c4bfdf4 100644
--- a/.github/workflows/ci-scripts.yml
+++ b/.github/workflows/ci-scripts.yml
@@ -13,13 +13,15 @@ env:
 
 jobs:
   test:
-    name: ${{ matrix.os }}/${{ matrix.deps }}/${{ matrix.base }}/${{ matrix.cmp }}/${{ matrix.configuration }}
+    name: ${{ matrix.os }}/${{ matrix.deps }}/${{ matrix.base }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.cross }}
     runs-on: ${{ matrix.os }}
     env:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
       BASE: ${{ matrix.base }}
       SET: ${{ matrix.deps }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
+      TEST: ${{ matrix.test }}
       APT: re2c
       CHOCO: re2c
       BREW: re2c
@@ -33,48 +35,71 @@ jobs:
             cmp: gcc
             configuration: default
             base: "7.0"
-            deps: "base7"
+            deps: "deps2"
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: static
             base: "7.0"
-            deps: "base7"
+            deps: "deps2"
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: static
             base: "7.0"
-            deps: "base7"
+            deps: "deps2"
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
             base: "3.15"
+            deps: "no-deps"
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: static
             base: "3.15"
-            deps: "base3-15"
+            deps: "deps2"
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: static
             base: "3.14"
-            deps: "base3-14"
+            deps: "deps1"
 
           - os: windows-2019
             cmp: vs2019
             configuration: default
             base: "7.0"
-            deps: "base7"
+            deps: "deps2"
 
           - os: windows-2019
             cmp: vs2019
             configuration: static
             base: "7.0"
-            deps: "base7"
+            deps: "deps2"
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            deps: "no-deps"
+            cross: "RTEMS-pc386-qemu@4.9"
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            deps: "no-deps"
+            cross: "RTEMS-pc386-qemu@4.10"
+            test: NO
+
+#          - os: ubuntu-latest
+#            cmp: gcc
+#            configuration: default
+#            base: "7.0"
+#            deps: "no-deps"
+#            cross: "RTEMS-pc686-qemu@5"
     steps:
     - uses: actions/checkout@v2
       with: