diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a7f55a49bbb3bca8afd0fa0a0bdbddda267bf56..956d19c68902f5450471a70fc34279c274951abc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,62 +1,69 @@
-image: lofareosc/prefactor-ci:latest
+image: lofareosc/prefactor3-cwl:latest
 
 variables:
   TEST_DATASET_NAME: "L570745_uv_first10.MS.tar.xz"
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
 
 stages:
-  - build_docker
-  - push_docker
+  - download_data
+  - test_prefactor
   - validate_cwl_scripts
   - test_steps
   - integration_test
 
 before_script:
-   - mkdir workdir
-   - mkdir logs
+  - mkdir workdir
+  - mkdir logs
 
 after_script:
   - echo "All done"
 
-build_docker:
-  image: docker:latest
-  stage: build_docker
-  only:
-    - tags
+download_data:
+  stage: download_data
   script:
-    - apk add git subversion git-lfs bash
-    - cd Docker
-    - bash build_docker.sh
+    - mkdir data && cd data
+    - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/$TEST_DATASET_NAME -O $TEST_DATASET_NAME && tar -xf $TEST_DATASET_NAME && rm -f $TEST_DATASET_NAME
+    - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/example.h5 -O example.h5
+    - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/A-Team_lowres.sourcedb -O A-Team_lowres.sourcedb
+  artifacts:
+    paths:
+    - data
 
-push_docker_tags:
-  image: docker:latest
-  allow_failure: true
-  stage: push_docker
-  only:
-    - tags
+test_prefactor:
+  stage: test_prefactor
+  needs: ["download_data"]
   script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker tag lofareosc/prefactor-ci:latest $CI_REGISTRY/prefactor-ci:$CI_COMMIT_REF_NAME
-    - docker push $CI_REGISTRY/prefactor-ci:$CI_COMMIT_REF_NAME
+     - cd data
+     - ls -l
 
 validate_scripts:
   stage: validate_cwl_scripts
   script:
     - for file in `find . -name 'steps/*.cwl'`; do cwltool --validate $file; done
 
+blsmooth:
+  stage: test_steps
+  allow_failure: true
+  needs: ["download_data"]
+  script:
+    - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH steps/blsmooth.cwl test_jobs/blsmooth.json
+
 find_skymodel_cal:
   stage: test_steps
   allow_failure: true
+  needs: ["download_data"]
   script:
     - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH steps/find_skymodel_cal.cwl test_jobs/find_skymodel_cal.json
 
-blsmooth:
+check_ateam_separation:
   stage: test_steps
   allow_failure: true
+  needs: ["download_data"]
   script:
-    - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH steps/blsmooth.cwl test_jobs/blsmooth.json
+    - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH steps/check_ateam_separation.cwl test_jobs/check_ateam_separation.json
 
-pol_align:
+prefactor_calibrator:
   stage: integration_test
+  needs: ["download_data"]
   script:
-    - cwltool --no-container subworkflow/pol_align.cwl test_jobs/pol_align.json
+    - cwltool --no-container workflows/HBA_calibrator.cwl test_jobs/HBA_calibrator.json
diff --git a/lofar-cwl/steps/Ateamclipper.cwl b/lofar-cwl/steps/Ateamclipper.cwl
index e74db690c206dd8acbeae17be1d47e627f061c9b..0badc8355b972025e8dc4341cad672b7c6eee4e6 100755
--- a/lofar-cwl/steps/Ateamclipper.cwl
+++ b/lofar-cwl/steps/Ateamclipper.cwl
@@ -4,8 +4,7 @@ $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 id: check_ateam_separation
 baseCommand:
-  - python3
-  - /usr/local/bin/Ateamclipper.py
+  - Ateamclipper.py
 inputs:
   - id: msin
     type:
diff --git a/steps/add_missing_stations.cwl b/steps/add_missing_stations.cwl
index 18627726693a3099b6d791ccc75f6d035088b23d..5370829be0754975a110d9074ededbefe6799d3e 100644
--- a/steps/add_missing_stations.cwl
+++ b/steps/add_missing_stations.cwl
@@ -5,8 +5,7 @@ $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 id: add_missing_stations
 baseCommand:
-  - python3
-  - /usr/local/bin/add_missing_stations.py
+  - add_missing_stations.py
 inputs:
   - default: output.h5
     id: h5parm
diff --git a/steps/aoflag.cwl b/steps/aoflag.cwl
index d93d2bd61c7af6b844a742712faeb71152b01c49..4f6c03a5e30790a364e4981a3499699cbcf4119b 100644
--- a/steps/aoflag.cwl
+++ b/steps/aoflag.cwl
@@ -140,7 +140,6 @@ requirements:
           mkdir -pv workdir
           cp -r \$directories workdir/. && cd workdir
           concat=out.MS_[0-9*]
-          echo \$1 \$2 \$3 \$4 \$concat
           aoflagger \$1 \$2 \$3 \$4 \$concat
 
 stdout: aoflag.log
diff --git a/steps/blsmooth.cwl b/steps/blsmooth.cwl
index 0bda55d69de87f396daddb8eb7f1ef08dedcc345..6f4efd6b3d68a7cb7d1e7a37948af1bcc80a9aad 100644
--- a/steps/blsmooth.cwl
+++ b/steps/blsmooth.cwl
@@ -3,8 +3,7 @@ cwlVersion: v1.0
 id: blsmooth
 label: BLsmooth
 baseCommand:
-  - python3
-  - /usr/local/bin/BLsmooth.py
+  - BLsmooth.py
 inputs:
   - id: msin
     type: Directory
diff --git a/steps/check_ateam_separation.cwl b/steps/check_ateam_separation.cwl
index 699cbdab31f6ce892854dcd9e144b50074ea71db..a6da2abcfeb07be470baf56a33ef7944a277de6d 100644
--- a/steps/check_ateam_separation.cwl
+++ b/steps/check_ateam_separation.cwl
@@ -2,8 +2,7 @@ class: CommandLineTool
 cwlVersion: v1.0
 id: check_ateam_separation
 baseCommand:
-  - python3
-  - /usr/local/bin/check_Ateam_separation.py
+  - check_Ateam_separation.py
 inputs:
   - id: ms
     type:
diff --git a/steps/createRMh5parm.cwl b/steps/createRMh5parm.cwl
index d73f62816835f2b0de6e1e24981e8d2194bc7c93..06c9859332945aec904e964e4d7003d50be0443d 100644
--- a/steps/createRMh5parm.cwl
+++ b/steps/createRMh5parm.cwl
@@ -3,8 +3,7 @@ cwlVersion: v1.0
 id: createRMh5parm
 label: createRMh5parm
 baseCommand:
-  - python3
-  - /usr/local/bin/createRMh5parm.py
+  - createRMh5parm.py
 inputs:
   - id: msin
     type:
diff --git a/steps/directory_listing.cwl b/steps/directory_listing.cwl
index b4267867c3732e9a6020a1642b3a29abb8b01655..73301837e0eb8d7a5f0e9495e14e61bd8962af86 100644
--- a/steps/directory_listing.cwl
+++ b/steps/directory_listing.cwl
@@ -47,7 +47,7 @@ arguments:
     valueFrom: d
 hints:
   - class: DockerRequirement
-    dockerPull: 'lofareosc/prefactor-ci:master'
+    dockerPull: lofareosc/prefactor3-cwl
+stdout: out_file
 requirements:
   - class: InlineJavascriptRequirement
-stdout: out_file
diff --git a/steps/h5parm_pointingname.cwl b/steps/h5parm_pointingname.cwl
index 81e2fedd7df8b065f369a1464651ae87502f507d..e1a99a389985b84f9448ae14ddc53c4601e1d353 100644
--- a/steps/h5parm_pointingname.cwl
+++ b/steps/h5parm_pointingname.cwl
@@ -5,8 +5,7 @@ $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 id: h5parm_pointingname
 baseCommand:
-  - python3
-  - /usr/local/bin/h5parm_pointingname.py
+  - h5parm_pointingname.py
 inputs:
   - format: 'lofar:#H5Parm'
     id: h5parmFile
diff --git a/steps/plot_Ateamclipper.cwl b/steps/plot_Ateamclipper.cwl
index 9b019713580b0f0e61c2587f162112b5d218667f..c9e198210122c159ac4c18f06294c4e8a1e444c5 100644
--- a/steps/plot_Ateamclipper.cwl
+++ b/steps/plot_Ateamclipper.cwl
@@ -4,8 +4,7 @@ $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 id: plot_Ateamclipper
 baseCommand:
-  - python3
-  - /usr/local/bin/plot_Ateamclipper.py
+  - plot_Ateamclipper.py
 inputs:
   - id: clipper_output
     type: File
diff --git a/steps/structure_function.cwl b/steps/structure_function.cwl
index 3ae8620f64493da2927b335851f6851024b2febd..bc1383670481798201b56383b82d97f2c196ca6e 100644
--- a/steps/structure_function.cwl
+++ b/steps/structure_function.cwl
@@ -5,8 +5,7 @@ $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 id: structure_function
 baseCommand:
-  - python3
-  - /usr/local/bin/getStructure_from_phases.py
+  - getStructure_from_phases.py
 inputs:
   - format: 'lofar:#H5Parm'
     id: h5parmFile
diff --git a/steps/transfer_solutions.cwl b/steps/transfer_solutions.cwl
index 7b5298d0f97f6ac729b94ba254985e0f4e4361bf..d58d3145c8cbb716e53940a6c91a828b2b96b361 100644
--- a/steps/transfer_solutions.cwl
+++ b/steps/transfer_solutions.cwl
@@ -4,8 +4,7 @@ $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 id: transfer_solutions
 baseCommand:
-  - python3
-  - /usr/local/bin/transfer_solutions.py
+  - transfer_solutions.py
 inputs:
   - default: output.h5
     id: h5parm
diff --git a/test_jobs/HBA_calibrator.json b/test_jobs/HBA_calibrator.json
new file mode 100644
index 0000000000000000000000000000000000000000..9e44c2dc4335244748d74732d3ff7ae330426694
--- /dev/null
+++ b/test_jobs/HBA_calibrator.json
@@ -0,0 +1,9 @@
+{
+    "msin" : [
+        {"class": "Directory", "path": "../data/L570745_SB000_uv_first10.MS"},
+        {"class": "Directory", "path": "../data/L570745_SB001_uv_first10.MS"},
+        {"class": "Directory", "path": "../data/L570745_SB002_uv_first10.MS"}        
+    ],
+    "raw_data": false,
+    "demix": false,
+} 
diff --git a/test_jobs/blsmooth.json b/test_jobs/blsmooth.json
index 5b300249de098dafe2ad49b7b68b8212ce6ba563..a7fbbce8018ee373273e29034b21795d1fc807c7 100644
--- a/test_jobs/blsmooth.json
+++ b/test_jobs/blsmooth.json
@@ -1,7 +1,7 @@
 {
     "msin": {
             "class": "Directory",
-            "path": "/data/L570745_SB003_uv_first10.MS"
+            "path": "../data/L570745_SB003_uv_first10.MS"
         },
     "do_smooth": true
 }
diff --git a/test_jobs/check_ateam_separation.json b/test_jobs/check_ateam_separation.json
new file mode 100644
index 0000000000000000000000000000000000000000..37f4990ca3bfe1a799ceaa9883758a026c7fb11d
--- /dev/null
+++ b/test_jobs/check_ateam_separation.json
@@ -0,0 +1,6 @@
+{
+  "ms": {
+    "class": "Directory",
+    "path": "../data/L570745_SB001_uv_first10.MS"
+  }
+}
diff --git a/test_jobs/find_skymodel_cal.json b/test_jobs/find_skymodel_cal.json
index 1a0067244b08ded29eccd45b1ec5b3394f72b164..b22f507928b4c9425d60dc31d878ae8738349e24 100644
--- a/test_jobs/find_skymodel_cal.json
+++ b/test_jobs/find_skymodel_cal.json
@@ -1,10 +1,10 @@
 {
     "msin": {
         "class": "Directory",
-        "path": "/data/L570745_SB000_uv_first10.MS"
+        "path": "../data/L570745_SB000_uv_first10.MS"
     },
     "skymodels": {
         "class": "Directory",
-        "path": "/data/skymodels"
+        "path": "/usr/local/share/prefactor/skymodels"
     }
 }
diff --git a/test_jobs/integration_test_prefactor_calibrator.json b/test_jobs/integration_test_prefactor_calibrator.json
deleted file mode 100644
index 672f979893679218fb67c1cc97ecb8721962aa7c..0000000000000000000000000000000000000000
--- a/test_jobs/integration_test_prefactor_calibrator.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "msin" : [
-        {"class": "Directory", "path": "/data/L570745_SB000_uv_first10.MS"},
-        {"class": "Directory", "path": "/data/L570745_SB001_uv_first10.MS"},
-        {"class": "Directory", "path": "/data/L570745_SB002_uv_first10.MS"}        
-    ],
-    "raw_data": false,
-    "demix": false,
-    "skymodels": {
-        "class": "Directory",
-        "path": "/data/skymodels"
-    },
-    "A-Team_sky_model": "/data/skymodels/Ateam_LBA_CC.skymodel"
-} 
diff --git a/test_jobs/pol_align.json b/test_jobs/pol_align.json
index 0cdbed898de539d8a086933afbb8b98b601a80d8..aad9492c2fac5cac30fbbfa88cb59004625ce9f3 100644
--- a/test_jobs/pol_align.json
+++ b/test_jobs/pol_align.json
@@ -2,6 +2,6 @@
   "input_h5parm": {
     "class": "File",
     "format": "lofar:#H5Parm",
-    "path": "/data/example.h5"
+    "path": "../data/example.h5"
   }
 }