diff --git a/.github/workflows/release-chectl.yml b/.github/workflows/release-chectl.yml
index 4ccabbe88..b21e1ffcd 100644
--- a/.github/workflows/release-chectl.yml
+++ b/.github/workflows/release-chectl.yml
@@ -8,6 +8,10 @@ on:
         description: 'The version that is going to be released. Should be in format 7.y.z'
         required: true
         default: '7.y.z'
+      dwoVersion:
+        description: 'The version of DevWorkspace Operator used in the release. Should be in format v0.y.z'
+        required: true
+        default: 'v0.y.z'
       forceflag:
         description: 'To force creation of .x branch, use --force flag here'
         default: ''
@@ -47,15 +51,20 @@ jobs:
             chectlVersion="${{ github.event.inputs.version }}"
           fi
 
-          # To determine DWO version, we have to replace first 7. with v0.
-          # then major DWO version is behind upstream Che version by 26
-          # and the minor version is the same
-          # e.g 7.27.0 for Che = v0.1.0 for DWO
-          chectlMajorMinorVersion=${chectlVersion#7.}
-          chectlMajorVersion=${chectlMajorMinorVersion%.*}
-          dwoMajorVersion=$((${chectlMajorVersion}-26))
-          dwoMinorVersion=${chectlMajorMinorVersion%.*}
-          dwoVersion=v0.${dwoMajorVersion}.${dwoMinorVersion}
+          if [[ "${{ github.event.inputs.dwoVersion }}" == "" ]] || [[ "${{ github.event.inputs.dwoVersion }}" == "v0.y.z" ]]; then
+            # TODO using a fixed version of latest DWO release, until new DWO release workflow will be implemented
+            dwoVersion=v0.7.2
+
+            # the following block of code can be uncommented to automatically use the latest available version of DWO
+            # versions=$(curl \
+            #   -H "Authorization: bearer ${GITHUB_TOKEN}" \
+            #   -X POST -H "Content-Type: application/json" --data \
+            #   '{"query": "{ repository(owner: \"devfile\", name: \"devworkspace-operator\") { refs(refPrefix: \"refs/tags/\", last: 2, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) { edges { node { name } } } } }" } ' \
+            #   https://api.github.com/graphql)
+            # dwoVersion=$(echo "${versions[@]}" | jq '.data.repository.refs.edges[1].node.name | sub("\""; "")' | tr -d '"')
+          else
+            dwoVersion="${{ github.event.inputs.dwoVersion }}"
+          fi
 
           # generic method to call a GH action and pass in a single var=val parameter
           invokeAction() {
@@ -86,4 +95,4 @@ jobs:
           }
 
           # invoke action from chectl repo
-          invokeAction che-incubator/chectl "Release - create pull request for upcoming release" "4008310" "version=${chectlVersion},dwoVersion=${dwoVersion}"
+          invokeAction che-incubator/chectl "Release - create pull request for upcoming release" "4008310" "main" "version=${chectlVersion},dwoVersion=${dwoVersion}"
diff --git a/olm/prepare-community-operators-update.sh b/olm/prepare-community-operators-update.sh
index 9b25f571f..e280aa25e 100755
--- a/olm/prepare-community-operators-update.sh
+++ b/olm/prepare-community-operators-update.sh
@@ -28,7 +28,7 @@ while [[ "$#" -gt 0 ]]; do
   case $1 in
     '-u'|'--user') GITHUB_USER="$2"; shift 1;;
     '-t'|'--token') GITHUB_TOKEN="$2"; shift 1;;
-    '-f'|'--force') FORCE="-f";;
+    '-f'|'--force') FORCE="-f"; shift 0;;
     '-p'|'--platform') PLATFORMS="$2";shift 1;;
     '-h'|'--help') usage;;
   esac