diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index a4a4b646c..6fd1749b4 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -31,22 +31,22 @@ on:
 
 jobs:
   build_and_publish_frontend:
-    name: Build and publish frontend image for ${{ github.event.inputs.environment }}
-    environment: ${{ github.event.inputs.environment }}
+    name: Build and publish frontend image for ${{ inputs.environment }}
+    environment: ${{ inputs.environment }}
     runs-on: ubuntu-latest
     env:
       DOCKER_LOGIN: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       DOCKER_REPO: ${{ secrets.DOCKER_REPO || 'olakego' }}
       DOCKER_REPO_WORKER: ${{ secrets.DOCKER_REPO_WORKER || 'olakego' }}
-      ENVIRONMENT: ${{ github.event.inputs.environment }}
-      VERSION: ${{ github.event.inputs.version }}
+      ENVIRONMENT: ${{ inputs.environment }}
+      VERSION: ${{ inputs.version }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.environment == 'master' && 'master' || (github.event.inputs.environment == 'staging' && 'staging' || github.event.inputs.environment == 'dev' && 'ci/workerReleaseIssues' || 'develop') }}
+          ref: ${{ inputs.environment == 'master' && 'master' || (inputs.environment == 'staging' && 'staging' || inputs.environment == 'dev' && 'ci/workerReleaseIssues' || 'develop') }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
diff --git a/.github/workflows/draft-release-and-changelog.yml b/.github/workflows/draft-release-and-changelog.yml
index c4bf4731f..684c67e86 100644
--- a/.github/workflows/draft-release-and-changelog.yml
+++ b/.github/workflows/draft-release-and-changelog.yml
@@ -29,7 +29,7 @@ jobs:
         id: generate-next-version
         run: |
           if [ -z "$LATEST_TAG" ]; then
-            next_version="v0.1.0"
+            next_version="v0.0.5"
           else
             # Remove 'v' prefix and split version into array
             version=${LATEST_TAG#v}