diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml
index 89a72fd852..987f5c1ad2 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -28,15 +28,20 @@ jobs:
         # the default is to add -j $(nproc), but some images
         # require more specifications when built
                 include:
-                    - command-line: -j $(nproc)
+                    - setconfig-option: ''
+                    - isa-option: ''
                     - image: ALL_CHI
-                      command-line: --default=ALL PROTOCOL=CHI -j $(nproc)
+                      setconfig-option: RUBY_PROTOCOL_CHI=y
+                      isa-option: ALL
                     - image: ALL_MSI
-                      command-line: --default=ALL PROTOCOL=MSI -j $(nproc)
+                      setconfig-option: RUBY_PROTOCOL_MSI=y
+                      isa-option: ALL
                     - image: ALL_MESI_Two_Level
-                      command-line: --default=ALL PROTOCOL=MESI_Two_Level -j $(nproc)
+                      setconfig-option: RUBY_PROTOCOL_MESI_TWO_LEVEL=y
+                      isa-option: ALL
                     - image: NULL_MI_example
-                      command-line: --default=NULL PROTOCOL=MI_example -j $(nproc)
+                      setconfig-option: RUBY_PROTOCOL_MI_EXAMPLE=y
+                      isa-option: 'NULL'
         runs-on: [self-hosted, linux, x64]
         needs: name-artifacts
         container: ghcr.io/gem5/ubuntu-22.04_all-dependencies:latest
@@ -46,8 +51,14 @@ jobs:
           # Scheduled workflows run on the default branch by default. We
           # therefore need to explicitly checkout the develop branch.
                   ref: develop
+            - name: defconfig gem5
+              if: ${{ matrix.setconfig-option  != '' }}
+              run: scons defconfig build/${{ matrix.image }} build_opts/${{ matrix.isa-option }}
+            - name: setconfig gem5
+              if: ${{ matrix.setconfig-option  != '' }}
+              run: scons setconfig build/${{ matrix.image }} ${{ matrix.setconfig-option }}
             - name: Build gem5
-              run: scons build/${{ matrix.image }}/gem5.opt ${{ matrix.command-line }}
+              run: scons build/${{ matrix.image }}/gem5.opt -j $(nproc)
             - uses: actions/upload-artifact@v3
               with:
                   name: ${{ needs.name-artifacts.outputs.build-name }}${{ matrix.image }}
@@ -245,8 +256,10 @@ jobs:
                   ref: develop
             - name: Build ARM/gem5.opt
               run: scons build/ARM/gem5.opt --ignore-style --duplicate-sources -j$(nproc)
+            - name: disable systemc
+              run: scons setconfig build/ARM --ignore-style USE_SYSTEMC=n
             - name: Build ARM/libgem5_opt.so
-              run: scons build/ARM/libgem5_opt.so --with-cxx-config --without-python --without-tcmalloc USE_SYSTEMC=0 -j$(nproc) --duplicate-sources
+              run: scons build/ARM/libgem5_opt.so --with-cxx-config --without-python --without-tcmalloc -j$(nproc) --duplicate-sources
             - name: Compile gem5 withing SystemC
               working-directory: ${{ github.workspace }}/util/systemc/gem5_within_systemc
               run: make
diff --git a/.github/workflows/gpu-tests.yaml b/.github/workflows/gpu-tests.yaml
index b390e0750f..7edcab5ba5 100644
--- a/.github/workflows/gpu-tests.yaml
+++ b/.github/workflows/gpu-tests.yaml
@@ -61,7 +61,7 @@ jobs:
               working-directory: ${{ github.workspace }}
               run: |
                   build/GCN3_X86/gem5.opt configs/example/apu_se.py -n3 --mem-size=8GB --reg-alloc-policy=dynamic --benchmark-root="lulesh" -c \
-                  lulesh 0.01 2
+                  lulesh --options="0.01 2"
 
     HACC-tests:
         runs-on: [self-hosted, linux, x64]
diff --git a/.github/workflows/weekly-tests.yaml b/.github/workflows/weekly-tests.yaml
index 72b1454a5e..6c211435c2 100644
--- a/.github/workflows/weekly-tests.yaml
+++ b/.github/workflows/weekly-tests.yaml
@@ -89,11 +89,7 @@ jobs:
 
             - name: Checkout DRAMSys
               working-directory: ${{ github.workspace }}/ext/dramsys
-              run: |
-                  git clone https://github.com/tukl-msd/DRAMSys DRAMSys
-                  cd DRAMSys
-                  git checkout -b gem5 09f6dcbb91351e6ee7cadfc7bc8b29d97625db8f
-                  git submodule update --init --recursive
+              run: git clone https://github.com/tukl-msd/DRAMSys --branch v5.0 --depth 1 DRAMSys
 
       # gem5 is built separately because it depends on the DRAMSys library
             - name: Build gem5