diff --git a/.github/workflows/test.yml b/.github/workflows/test-branch.yml
old mode 100755
new mode 100644
similarity index 93%
rename from .github/workflows/test.yml
rename to .github/workflows/test-branch.yml
index 2ec402f..8ebefcb
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test-branch.yml
@@ -1,4 +1,4 @@
-name: Test
+name: Test Branch
 
 on: 
   push:
@@ -56,6 +56,6 @@ jobs:
           lazbuild ${{ matrix.config.args }} test_lazarus.lpi
           
       - name: Run Test
-        if: matrix.config.name != 'AArch64'
+        if: matrix.config.name != 'AArch64' # AArch64 was cross compiled
         run: |
           ./test
diff --git a/.github/workflows/test-revision.yml b/.github/workflows/test-revision.yml
new file mode 100644
index 0000000..c3fbdd1
--- /dev/null
+++ b/.github/workflows/test-revision.yml
@@ -0,0 +1,61 @@
+name: Test Revision
+
+on: 
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
+      
+jobs:
+  test:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      fail-fast: false
+      matrix:
+        config:            
+          - name: Windows 64
+            os: windows-latest
+            cpu: x86_64
+            
+          - name: Windows 32  
+            os: windows-latest
+            cpu: i386
+
+          - name: Linux 64
+            os: ubuntu-latest
+            cpu: x86_64
+          
+          - name: AArch64  
+            os: ubuntu-latest
+            cpu: aarch64
+            args: --cpu=aarch64
+            
+          - name: MacOS 64
+            os: macos-latest
+            cpu: x86_64
+            args: --widgetset=cocoa
+            
+    steps:
+      - uses: actions/checkout@v2.3.4
+      
+      - name: Install Lazarus
+        uses: ./
+        with:
+          cpu: ${{ matrix.config.cpu }}
+          laz-revision: 58bab5263932362aa35a59bf0cd9439dfe87b25c
+          fpc-revision: 6e6c946e0fd1765f99110e12c79db27a400c6587
+      
+      - name: Build Test
+        run: |
+          lazbuild ${{ matrix.config.args }} test_lazarus.lpi
+          
+      - name: Run Test
+        if: matrix.config.name != 'AArch64' # AArch64 was cross compiled
+        run: |
+          ./test
diff --git a/README.md b/README.md
index d6972ba..73aa1f0 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,10 @@ Caches that are not in a week are [removed](https://github.com/actions/cache#cac
   
 - `cpu`: CPU target to setup Lazarus for. 
 - `laz-branch`: Lazarus (gitlab) branch to install
+- `laz-revision`: Lazarus (gitlab) commit hash to install
 - `fpc-branch`: FPC (gitlab) branch to install
+- `fpc-revision`: FPC (gitlab) commit hash to install
+- `fpcup-url`: URL to fpcup exectuable to install. By default a hard coded version is used.
 
 Supported CPU targets:
 - `x86_64`: Windows, Linux, macOS
@@ -66,12 +69,12 @@ jobs:
       - uses: actions/checkout@v2.3.4
       
       - name: Install Lazarus
-        uses: ollydev/setup-lazarus-fpcup@v2
+        uses: ollydev/setup-lazarus-fpcup@v2.2
         with:
           cpu: ${{ matrix.config.cpu }}
-          laz-branch: lazarus_2_2_0_rc1
-          fpc-branch: release_3_2_2_rc1
-      
+          laz-branch: lazarus_2_2_0_rc1 # laz-revision: 58bab5263932362aa35a59bf0cd9439dfe87b25c
+          fpc-branch: release_3_2_2_rc1 # fpc-revision: 6e6c946e0fd1765f99110e12c79db27a400c6587
+		 
       - name: Test Installation
         if: matrix.config.name != 'AArch64' # AArch64 was cross compiled!
         run: |