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 f9d69b5c4e8e1f0ba325b5dcd5fa0099f7df3eb9..6debf1402b579e5ae72e24f0ea5a1793c50579bb 100644
--- a/steps/find_skymodel_cal.cwl
+++ b/steps/find_skymodel_cal.cwl
@@ -12,14 +12,10 @@ inputs:
       inputBinding:
         position: 0
     - id: skymodels
-<<<<<<< HEAD
       type:
         - Directory?
         - File?
-=======
-      type: Directory?
->>>>>>> 648aff693fcd8267a3f707ad8fc9609715cddaa2
-      doc: Directory containing the sky models
+      doc: Directory or file containing the sky models
     - id: skymodels_extension
       type: string?
       doc: path extension of the sky models
@@ -81,8 +77,4 @@ requirements:
 
 hints:
   DockerRequirement:
-<<<<<<< HEAD
-    dockerPull: lofareosc/prefactor:latest
-=======
-    dockerPull: lofareosc/prefactor-ci:master
->>>>>>> 648aff693fcd8267a3f707ad8fc9609715cddaa2
+    dockerPull: lofareosc/prefactor:HBAcalibrator