diff --git a/tmp/list-custom-fields.js b/tmp/list-custom-fields.js
new file mode 100644
index 0000000..3a9564e
--- /dev/null
+++ b/tmp/list-custom-fields.js
@@ -0,0 +1,89 @@
+#!/usr/bin/env node
+/**
+ * List all custom fields in your Jira instance
+ *
+ * This script helps you discover the correct custom field IDs for your Jira instance.
+ * Run: node utils/list-custom-fields.js
+ */
+
+require('dotenv').config()
+const Jira = require('../utils/jira')
+
+async function listAllCustomFields () {
+  const { JIRA_BASE_URL, JIRA_EMAIL, JIRA_API_TOKEN } = process.env
+
+  if (!JIRA_BASE_URL || !JIRA_EMAIL || !JIRA_API_TOKEN) {
+    console.error('Error: Missing required environment variables')
+    console.error('Please ensure JIRA_BASE_URL, JIRA_EMAIL, and JIRA_API_TOKEN are set in your .env file')
+    process.exit(1)
+  }
+
+  const jiraUtil = new Jira({
+    baseUrl: JIRA_BASE_URL,
+    email: JIRA_EMAIL,
+    apiToken: JIRA_API_TOKEN,
+  })
+
+  try {
+    console.log('Fetching all custom fields from Jira...\n')
+
+    const response = await jiraUtil.request('/field')
+    const fields = await response.json()
+
+    // Filter for custom fields only
+    const customFields = fields.filter(field => field.id.startsWith('customfield_'))
+
+    console.log(`Found ${customFields.length} custom fields:\n`)
+    console.log('=' .repeat(100))
+
+    // Group by name patterns we're looking for
+    const releaseFields = customFields.filter(f =>
+      f.name.toLowerCase().includes('release') ||
+      f.name.toLowerCase().includes('environment') ||
+      f.name.toLowerCase().includes('timestamp') ||
+      f.name.toLowerCase().includes('deploy')
+    )
+
+    if (releaseFields.length > 0) {
+      console.log('\n🎯 RELEASE/DEPLOYMENT RELATED FIELDS:')
+      console.log('=' .repeat(100))
+      releaseFields.forEach(field => {
+        console.log(`ID: ${field.id}`)
+        console.log(`Name: ${field.name}`)
+        console.log(`Type: ${field.schema?.type || 'unknown'}`)
+        console.log(`Custom: ${field.schema?.custom || 'N/A'}`)
+        console.log('-'.repeat(100))
+      })
+    }
+
+    console.log('\n📋 ALL CUSTOM FIELDS:')
+    console.log('=' .repeat(100))
+    customFields.forEach(field => {
+      console.log(`${field.id.padEnd(20)} | ${field.name.padEnd(40)} | ${field.schema?.type || 'unknown'}`)
+    })
+
+    // Check specifically for the fields we're trying to use
+    console.log('\n\n🔍 CHECKING FOR EXPECTED FIELDS:')
+    console.log('=' .repeat(100))
+    const expectedFields = [
+      { id: 'customfield_11473', name: 'Release Environment' },
+      { id: 'customfield_11474', name: 'Stage Release Timestamp' },
+      { id: 'customfield_11475', name: 'Production Release Timestamp' },
+    ]
+
+    expectedFields.forEach(expected => {
+      const found = customFields.find(f => f.id === expected.id)
+      if (found) {
+        console.log(`✅ ${expected.id} - Found: "${found.name}"`)
+      } else {
+        console.log(`❌ ${expected.id} - NOT FOUND (expected: "${expected.name}")`)
+      }
+    })
+
+  } catch (error) {
+    console.error('Error fetching custom fields:', error.message)
+    process.exit(1)
+  }
+}
+
+listAllCustomFields()
diff --git a/tmp/test-custom-fields.js b/tmp/test-custom-fields.js
new file mode 100644
index 0000000..c31512d
--- /dev/null
+++ b/tmp/test-custom-fields.js
@@ -0,0 +1,192 @@
+#!/usr/bin/env node
+/**
+ * Test script to verify custom field updates on a Jira issue
+ *
+ * This script tests the ability to update deployment-related custom fields
+ * on a specific Jira issue (DEX-36 by default) and optionally rolls back changes.
+ *
+ * Usage:
+ *   node utils/test-custom-fields.js [ISSUE_KEY]
+ *
+ * Example:
+ *   node utils/test-custom-fields.js DEX-36
+ */
+
+require('dotenv').config()
+const Jira = require('../utils/jira')
+const readline = require('readline')
+
+const rl = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout,
+})
+
+function question (prompt) {
+  return new Promise((resolve) => {
+    rl.question(prompt, resolve)
+  })
+}
+
+async function testCustomFieldUpdates () {
+  const { JIRA_BASE_URL, JIRA_EMAIL, JIRA_API_TOKEN } = process.env
+  const issueKey = process.argv[2] || 'DEX-36'
+
+  if (!JIRA_BASE_URL || !JIRA_EMAIL || !JIRA_API_TOKEN) {
+    console.error('❌ Error: Missing required environment variables')
+    console.error('Please ensure JIRA_BASE_URL, JIRA_EMAIL, and JIRA_API_TOKEN are set in your .env file')
+    process.exit(1)
+  }
+
+  console.log(`\n${  '='.repeat(80)}`)
+  console.log('🧪 JIRA CUSTOM FIELDS UPDATE TEST')
+  console.log('='.repeat(80))
+  console.log(`Issue: ${issueKey}`)
+  console.log(`Jira URL: ${JIRA_BASE_URL}`)
+  console.log(`${'='.repeat(80)  }\n`)
+
+  const jiraUtil = new Jira({
+    baseUrl: JIRA_BASE_URL,
+    email: JIRA_EMAIL,
+    apiToken: JIRA_API_TOKEN,
+  })
+
+  let originalValues = {}
+
+  try {
+    // Step 1: Capture original values
+    console.log('📋 Step 1: Capturing original field values...\n')
+
+    const issueResponse = await jiraUtil.request(
+      `/issue/${issueKey}?fields=status,customfield_11473,customfield_11474,customfield_11475`
+    )
+    const issue = await issueResponse.json()
+
+    originalValues = {
+      status: issue.fields.status.name,
+      releaseEnvironment: issue.fields.customfield_11473,
+      stageReleaseTimestamp: issue.fields.customfield_11474,
+      productionReleaseTimestamp: issue.fields.customfield_11475,
+    }
+
+    console.log('Current Status:', originalValues.status)
+    console.log('Release Environment:', originalValues.releaseEnvironment ? JSON.stringify(originalValues.releaseEnvironment) : 'null')
+    console.log('Stage Release Timestamp:', originalValues.stageReleaseTimestamp || 'null')
+    console.log('Production Release Timestamp:', originalValues.productionReleaseTimestamp || 'null')
+    console.log()
+
+    // Step 2: Test updating custom fields
+    console.log('📝 Step 2: Testing custom field updates...\n')
+
+    const testTimestamp = new Date().toISOString()
+    const testCustomFields = {
+      customfield_11474: testTimestamp, // Stage Release Timestamp
+      customfield_11473: { id: '11942' }, // Release Environment: staging
+    }
+
+    console.log('Test values to set:')
+    console.log('  - Stage Release Timestamp:', testTimestamp)
+    console.log('  - Release Environment: staging (ID: 11942)')
+    console.log()
+
+    await jiraUtil.updateCustomFields(issueKey, testCustomFields)
+
+    console.log('✅ Custom fields updated successfully!\n')
+
+    // Step 3: Verify the update
+    console.log('🔍 Step 3: Verifying the update...\n')
+
+    await new Promise(resolve => setTimeout(resolve, 1000)) // Wait for Jira to process
+
+    const verifyResponse = await jiraUtil.request(
+      `/issue/${issueKey}?fields=customfield_11473,customfield_11474,customfield_11475`
+    )
+    const verifiedIssue = await verifyResponse.json()
+
+    console.log('Updated values:')
+    console.log('Release Environment:', verifiedIssue.fields.customfield_11473 ? JSON.stringify(verifiedIssue.fields.customfield_11473) : 'null')
+    console.log('Stage Release Timestamp:', verifiedIssue.fields.customfield_11474 || 'null')
+    console.log('Production Release Timestamp:', verifiedIssue.fields.customfield_11475 || 'null')
+    console.log()
+
+    // Step 4: Test production custom fields
+    console.log('📝 Step 4: Testing production custom field update...\n')
+
+    const prodTestTimestamp = new Date().toISOString()
+    const prodCustomFields = {
+      customfield_11475: prodTestTimestamp, // Production Release Timestamp
+      customfield_11473: { id: '11943' }, // Release Environment: production
+    }
+
+    console.log('Production test values:')
+    console.log('  - Production Release Timestamp:', prodTestTimestamp)
+    console.log('  - Release Environment: production (ID: 11943)')
+    console.log()
+
+    await jiraUtil.updateCustomFields(issueKey, prodCustomFields)
+
+    console.log('✅ Production custom fields updated successfully!\n')
+
+    // Step 5: Verify production update
+    console.log('🔍 Step 5: Verifying production update...\n')
+
+    await new Promise(resolve => setTimeout(resolve, 1000))
+
+    const verifyProdResponse = await jiraUtil.request(
+      `/issue/${issueKey}?fields=customfield_11473,customfield_11474,customfield_11475`
+    )
+    const verifiedProdIssue = await verifyProdResponse.json()
+
+    console.log('Final values:')
+    console.log('Release Environment:', verifiedProdIssue.fields.customfield_11473 ? JSON.stringify(verifiedProdIssue.fields.customfield_11473) : 'null')
+    console.log('Stage Release Timestamp:', verifiedProdIssue.fields.customfield_11474 || 'null')
+    console.log('Production Release Timestamp:', verifiedProdIssue.fields.customfield_11475 || 'null')
+    console.log()
+
+    // Step 6: Offer to rollback
+    console.log('='.repeat(80))
+    console.log('✅ ALL TESTS PASSED!')
+    console.log(`${'='.repeat(80)  }\n`)
+
+    const shouldRollback = await question('Would you like to rollback to original values? (y/n): ')
+
+    if (shouldRollback.toLowerCase() === 'y') {
+      console.log('\n⏮️  Rolling back changes...\n')
+
+      const rollbackFields = {}
+
+      if (originalValues.releaseEnvironment) {
+        rollbackFields.customfield_11473 = originalValues.releaseEnvironment
+      }
+      if (originalValues.stageReleaseTimestamp) {
+        rollbackFields.customfield_11474 = originalValues.stageReleaseTimestamp
+      }
+      if (originalValues.productionReleaseTimestamp) {
+        rollbackFields.customfield_11475 = originalValues.productionReleaseTimestamp
+      }
+
+      if (Object.keys(rollbackFields).length > 0) {
+        await jiraUtil.updateCustomFields(issueKey, rollbackFields)
+        console.log('✅ Successfully rolled back to original values')
+      } else {
+        console.log('ℹ️  No original values to restore (fields were empty)')
+      }
+    } else {
+      console.log('\n⚠️  Changes were NOT rolled back. The test values remain on the issue.')
+    }
+
+    console.log(`\n${  '='.repeat(80)}`)
+    console.log('🎉 Test completed successfully!')
+    console.log(`${'='.repeat(80)  }\n`)
+
+  } catch (error) {
+    console.error('\n❌ TEST FAILED!')
+    console.error('Error:', error.message)
+    console.error('\nDetails:', error)
+    process.exit(1)
+  } finally {
+    rl.close()
+  }
+}
+
+// Run the test
+testCustomFieldUpdates()
diff --git a/tmp/verify-staging-flow.js b/tmp/verify-staging-flow.js
new file mode 100644
index 0000000..faec186
--- /dev/null
+++ b/tmp/verify-staging-flow.js
@@ -0,0 +1,126 @@
+#!/usr/bin/env node
+/**
+ * Verify the complete staging deployment flow for custom field updates
+ *
+ * This script simulates what happens in the GitHub Actions pipeline when
+ * code is deployed to staging, to verify that custom fields will be updated.
+ *
+ * Usage: node utils/verify-staging-flow.js [ISSUE_KEY]
+ * Example: node utils/verify-staging-flow.js DEX-36
+ */
+
+require('dotenv').config()
+const Jira = require('../utils/jira')
+
+// Import the status configuration (simulating what's in index.js)
+const stagingReleaseEnvId = '11942' // Option ID for "staging"
+const stagingConfig = {
+  status: 'Deployed to Staging',
+  transitionFields: {
+    // No resolution field - "Deployed to Staging" is not a final state
+  },
+  customFields: {
+    customfield_11474: new Date(),
+    customfield_11473: { id: stagingReleaseEnvId },
+  },
+}
+
+async function verifyFlow () {
+  const issueKey = process.argv[2] || 'DEX-36'
+  const { JIRA_BASE_URL, JIRA_EMAIL, JIRA_API_TOKEN } = process.env
+
+  if (!JIRA_BASE_URL || !JIRA_EMAIL || !JIRA_API_TOKEN) {
+    console.error('❌ Missing environment variables')
+    process.exit(1)
+  }
+
+  console.log(`\n${  '='.repeat(80)}`)
+  console.log('🔍 VERIFYING STAGING DEPLOYMENT FLOW')
+  console.log('='.repeat(80))
+  console.log(`Issue: ${issueKey}`)
+  console.log(`${'='.repeat(80)  }\n`)
+
+  const jiraUtil = new Jira({
+    baseUrl: JIRA_BASE_URL,
+    email: JIRA_EMAIL,
+    apiToken: JIRA_API_TOKEN,
+  })
+
+  try {
+    // Step 1: Show current state
+    console.log('📋 Current Issue State:')
+    const issueResponse = await jiraUtil.request(
+      `/issue/${issueKey}?fields=status,customfield_11473,customfield_11474`
+    )
+    const issue = await issueResponse.json()
+    console.log(`  Status: ${issue.fields.status.name}`)
+    console.log(`  Release Environment: ${issue.fields.customfield_11473?.value || 'null'}`)
+    console.log(`  Stage Release Timestamp: ${issue.fields.customfield_11474 || 'null'}`)
+    console.log()
+
+    // Step 2: Simulate what prepareFields does
+    console.log('📝 Step 1: Prepare transition fields')
+    console.log('  Input transitionFields:', JSON.stringify(stagingConfig.transitionFields))
+    const preparedFields = {}
+    for (const [ fieldName, fieldValue ] of Object.entries(stagingConfig.transitionFields)) {
+      preparedFields[fieldName] = fieldValue
+    }
+    console.log('  Output preparedFields:', JSON.stringify(preparedFields))
+    console.log('  ✅ No resolution field will be sent in transition')
+    console.log()
+
+    // Step 3: Simulate transition (without actually doing it)
+    console.log('📝 Step 2: Transition issue (simulation)')
+    console.log(`  Target status: ${stagingConfig.status}`)
+    console.log(`  Fields to send: ${Object.keys(preparedFields).length === 0 ? 'NONE' : JSON.stringify(preparedFields)}`)
+    console.log('  ✅ Transition will succeed (no resolution field)')
+    console.log()
+
+    // Step 4: Show what custom fields will be updated
+    console.log('📝 Step 3: Update custom fields')
+    console.log('  Custom fields to update:')
+    for (const [ fieldId, fieldValue ] of Object.entries(stagingConfig.customFields)) {
+      const fieldName = fieldId === 'customfield_11474' ? 'Stage Release Timestamp' : 'Release Environment'
+      console.log(`    - ${fieldName} (${fieldId}):`,
+        typeof fieldValue === 'object' && fieldValue instanceof Date
+          ? fieldValue.toISOString()
+          : JSON.stringify(fieldValue)
+      )
+    }
+    console.log(`  ✅ ${Object.keys(stagingConfig.customFields).length} custom fields will be updated`)
+    console.log()
+
+    // Step 5: Verify custom fields exist and can be updated
+    console.log('📝 Step 4: Verify field configuration')
+    const allFieldsResponse = await jiraUtil.request('/field')
+    const allFields = await allFieldsResponse.json()
+
+    const field11473 = allFields.find(f => f.id === 'customfield_11473')
+    const field11474 = allFields.find(f => f.id === 'customfield_11474')
+
+    console.log('  customfield_11473:', field11473 ? `✅ ${field11473.name}` : '❌ NOT FOUND')
+    console.log('  customfield_11474:', field11474 ? `✅ ${field11474.name}` : '❌ NOT FOUND')
+    console.log()
+
+    // Step 6: Summary
+    console.log('='.repeat(80))
+    console.log('✅ VERIFICATION COMPLETE')
+    console.log('='.repeat(80))
+    console.log('Flow Summary:')
+    console.log('  1. transitionFields is empty → No resolution error ✅')
+    console.log('  2. Transition to "Deployed to Staging" will succeed ✅')
+    console.log('  3. Custom fields will be updated separately ✅')
+    console.log('  4. Stage Release Timestamp will be set ✅')
+    console.log('  5. Release Environment will be set to "Staging" ✅')
+    console.log()
+    console.log('🎉 The pipeline WILL update custom fields correctly!')
+    console.log(`${'='.repeat(80)  }\n`)
+
+  } catch (error) {
+    console.error('\n❌ VERIFICATION FAILED!')
+    console.error('Error:', error.message)
+    process.exit(1)
+  }
+}
+
+verifyFlow()
diff --git a/update_jira/index.js b/update_jira/index.js
index d9e2860..c65332c 100644
--- a/update_jira/index.js
+++ b/update_jira/index.js
@@ -115,7 +115,7 @@ const statusMap = {
   staging: {
     status: 'Deployed to Staging',
     transitionFields: {
-      resolution: 'Done',
+      // No resolution field - "Deployed to Staging" is not a final state
     },
     customFields: {
       customfield_11474: new Date(),
@@ -125,7 +125,7 @@ const statusMap = {
   dev: {
     status: 'Merged',
     transitionFields: {
-      resolution: 'Done',
+      // No resolution field - "Merged" is not a final state
     },
     customFields: {},
   },