diff --git a/steps/blsmooth.cwl b/steps/blsmooth.cwl
index 835664af0caf46fa02d9706ff98c19056f4fe6f8..3629744dfca9e39b9f6a106f72dc06f0c3af3e7c 100644
--- a/steps/blsmooth.cwl
+++ b/steps/blsmooth.cwl
@@ -82,7 +82,7 @@ outputs:
       glob: $(inputs.msin.basename)
 hints:
  - class: DockerRequirement
-   dockerPull: lofareosc/prefactor:HBAcalibrator-ci:master
+   dockerPull: lofareosc/prefactor:HBAcalibrator
 requirements:
  - class: InitialWorkDirRequirement
    listing:
diff --git a/steps/find_skymodel_cal.cwl b/steps/find_skymodel_cal.cwl
index 48ab8ebe471d1aeae62bfcd086aab97ef448a659..ae6ca606850f2a29c4d76a906788d780895c0b9d 100644
--- a/steps/find_skymodel_cal.cwl
+++ b/steps/find_skymodel_cal.cwl
@@ -15,7 +15,11 @@ inputs:
       type:
         - Directory?
         - File?
+<<<<<<< HEAD
       doc: Directory containing the sky models
+=======
+      doc: Directory or file containing the sky models
+>>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276
     - id: skymodels_extension
       type: string?
       doc: path extension of the sky models
@@ -81,4 +85,8 @@ requirements:
 
 hints:
   DockerRequirement:
+<<<<<<< HEAD
     dockerPull: lofareosc/prefactor:master
+=======
+    dockerPull: lofareosc/prefactor:HBAcalibrator
+>>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276