diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01b780fa..1cdd6787 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- support for `CHECKBOXES` and `DROPDOWN` types to `goodToGoService`
+
 ## [8.6.0] - 2025-07-25
 
 ### Added
diff --git a/src/goodToGoService.ts b/src/goodToGoService.ts
index 258ee1f2..414ab7fc 100644
--- a/src/goodToGoService.ts
+++ b/src/goodToGoService.ts
@@ -27,6 +27,29 @@ export function generateGoodToGoFieldResourceDefinitions(
             ...generateCommonConfig(fieldDefinition),
           })
           break
+        case 'DROPDOWN':
+          if (fieldDefinition.options) {
+            memo.push({
+              type: 'CHOICE_SINGLE',
+              ...generateCommonConfig(fieldDefinition),
+              choices: fieldDefinition.options.map((option) => ({
+                label: option,
+                value: option,
+              })),
+            })
+          }
+          break
+        case 'CHECKBOXES':
+          if (fieldDefinition.options) {
+            memo.push({
+              type: 'CHOICE_MULTIPLE',
+              ...generateCommonConfig(fieldDefinition),
+              choices: fieldDefinition.options.map((option) => ({
+                label: option,
+                value: option,
+              })),
+            })
+          }
       }
 
       return memo