diff --git a/ .forgejo/workflows/build.yml b/ .forgejo/workflows/build.yml
index 509a682..aae3c47 100644
--- a/ .forgejo/workflows/build.yml	
+++ b/ .forgejo/workflows/build.yml	
@@ -48,11 +48,3 @@ jobs:
           file: ./docker/Dockerfile
           tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
           push: true
-      - name: Discord Notification
-        if: always()
-        run: |
-          STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}"
-          COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}"
-          curl -H "Content-Type: application/json" -X POST \
-          -d "{\"embeds\":[{\"title\":\"$STATUS\",\"description\":\"Build Image: \`${{env.CONTAINER_IMAGE_NAME}}:${{env.IMAGE_VERSION}}\`\nBy: \`${{gitea.actor}}\`\",\"color\":$COLOR}]}" \
-          ${{ env.DISCORD_WEBHOOK }}
diff --git a/ .forgejo/workflows/ci-cd.yml b/ .forgejo/workflows/ci-cd.yml
index 4a238d4..c804261 100644
--- a/ .forgejo/workflows/ci-cd.yml	
+++ b/ .forgejo/workflows/ci-cd.yml	
@@ -29,7 +29,7 @@ jobs:
               ca=["/etc/ssl/certs/ca-certificates.crt"]
       - name: Tag Version
         run: |
-          echo "IMAGE_VERSION=latest" >> $GITHUB_ENV
+          echo "IMAGE_VERSION=latest" >> $FORGEJO_ENV
       - name: Login in to registry
         uses: docker/login-action@v2
         with:
@@ -55,11 +55,25 @@ jobs:
             cd ~/repo
             ./replace-env.sh APP_CHECKIN "${{  env.IMAGE_VERSION }}"
             ./deploy.sh hrms-checkin
+
       - name: Discord Notification
         if: always()
         run: |
           STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}"
           COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}"
-          curl -H "Content-Type: application/json" -X POST \
-          -d "{\"embeds\":[{\"title\":\"$STATUS\",\"description\":\"Build & Deploy Image: \`${{env.CONTAINER_IMAGE_NAME}}:${{env.IMAGE_VERSION}}\`\nBy: \`${{gitea.actor}}\`\",\"color\":$COLOR}]}" \
+          TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+          curl -H "Content-Type: application/json" \
+          -X POST \
+          -d "{
+            \"embeds\": [{
+              \"title\": \"$STATUS\",
+              \"description\": \"**Build & Deploy:**\\n- Image: \`${{ env.CONTAINER_IMAGE_NAME }}\`\\n- Version: \`${{ env.IMAGE_VERSION }}\`\\n- Deployed by: \`${{ github.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
           ${{ env.DISCORD_WEBHOOK }}
diff --git a/ .forgejo/workflows/deploy.yml b/ .forgejo/workflows/deploy.yml
index d414ae8..5839a36 100644
--- a/ .forgejo/workflows/deploy.yml	
+++ b/ .forgejo/workflows/deploy.yml	
@@ -27,11 +27,3 @@ jobs:
             cd ~/repo
             ./replace-env.sh APP_CHECKIN "${{ inputs.version }}"
             ./deploy.sh hrms-checkin
-      - name: Discord Notification
-        if: always()
-        run: |
-          STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}"
-          COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}"
-          curl -H "Content-Type: application/json" -X POST \
-          -d "{\"embeds\":[{\"title\":\"$STATUS\",\"description\":\"Deploy Image: \`${{env.CONTAINER_IMAGE_NAME}}:${{env.IMAGE_VERSION}}\`\nBy: \`${{gitea.actor}}\`\",\"color\":$COLOR}]}" \
-          ${{ env.DISCORD_WEBHOOK }}