diff --git a/.github/workflows/quickstart_2.0.yml b/.github/workflows/quickstart_2.0.yml
index f6ce72493b6..d150d597397 100644
--- a/.github/workflows/quickstart_2.0.yml
+++ b/.github/workflows/quickstart_2.0.yml
@@ -3,7 +3,7 @@
 #
 # Workflow to automatedly verify the quickstart instructions
 
-name: Verify Quickstart 2.0
+name: Verify Quickstart 3.0
 
 on:
   workflow_dispatch:
@@ -11,35 +11,6 @@ on:
     - cron: "0 15 * * *"
 
 jobs:
-  get_input-srpms:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        ref: '2.0-stable'
-
-    - name: Set up Go 1.20
-      uses: actions/setup-go@v5
-      with:
-        go-version: 1.20
-      id: go
-
-    - name: Install Remaining Prerequisites
-      run: |
-        # Golang and docker are already installed on the agent
-        sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
-
-    - name: Download SRPMS
-      run: |
-        pushd toolkit
-        sudo make go-tools REBUILD_TOOLS=y
-        sudo make input-srpms DOWNLOAD_SRPMS=y
-        popd
-
   iso_quickstart:
     runs-on: ubuntu-latest
 
@@ -47,20 +18,40 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: '2.0-stable'
+        ref: '3.0-stable'
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20
+        go-version: 1.21
       id: go
 
     - name: Install Remaining Prerequisites
       run: |
         # Golang and docker are already installed on the agent
         sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
+        sudo apt -y install \
+            acl \
+            curl \
+            gawk \
+            genisoimage \
+            git \
+            golang-1.21-go \
+            jq \
+            make \
+            parted \
+            pigz \
+            openssl \
+            systemd \
+            qemu-utils \
+            rpm \
+            tar \
+            wget \
+            xfsprogs
+
+        # Fix go 1.21 link
+        sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
+        sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
 
     - name: ISO Quick Start
       run: |
@@ -75,23 +66,41 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: '2.0-stable'
+        ref: '3.0-stable'
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20
+        go-version: 1.21
       id: go
 
     - name: Install Remaining Prerequisites
       run: |
         # Golang and docker are already installed on the agent
-        sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
-
+        sudo apt -y install \
+            acl \
+            curl \
+            gawk \
+            genisoimage \
+            git \
+            golang-1.21-go \
+            jq \
+            make \
+            parted \
+            pigz \
+            openssl \
+            systemd \
+            qemu-utils \
+            rpm \
+            tar \
+            wget \
+            xfsprogs
+
+        # Fix go 1.21 link
+        sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
+        sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
     - name: VHDX Quick Start
       run: |
         pushd toolkit
         sudo make image REBUILD_TOOLS=y REBUILD_PACKAGES=n CONFIG_FILE=./imageconfigs/core-efi.json
-        popd
+        popd
\ No newline at end of file