diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js
index f3ebf120a..b0b360e62 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/deviceattributes.js
@@ -112,11 +112,19 @@ export default {
   },
   VolumeLevel: {
     itemTypes: ['Dimmer', 'Number'],
-    parameters: (item) => [p.increment(10), ...(item.type === 'Number' ? [p.stepSpeaker()] : [])]
+    parameters: () => [p.increment(10), p.retrievable()]
+  },
+  VolumeStep: {
+    itemTypes: ['String'],
+    parameters: () => [p.valueMapping('VOLUME_UP', true), p.valueMapping('VOLUME_DOWN', true)]
   },
   MuteState: {
     itemTypes: ['Switch'],
-    parameters: () => [p.inverted(), p.stepSpeaker()]
+    parameters: () => [p.inverted(), p.retrievable()]
+  },
+  MuteStep: {
+    itemTypes: ['String'],
+    parameters: () => [p.valueMapping('MUTE', true)]
   },
   EqualizerBass: {
     itemTypes: ['Dimmer', 'Number'],
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/devicetypes.js b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/devicetypes.js
index c73a9ff1d..3c1b05a3e 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/devicetypes.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/devicetypes.js
@@ -16,7 +16,9 @@ const switchAttributes = ['PowerLevel', 'Percentage', ...genericDeviceAttributes
 
 const entertainmentAttributes = [
   'VolumeLevel',
+  'VolumeStep',
   'MuteState',
+  'MuteStep',
   'Channel',
   'ChannelStep',
   'Input',
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js
index c657450bb..65b5a4a44 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/metadata/alexa/parameters.js
@@ -313,13 +313,6 @@ export default {
     multiple: true,
     visible: (_, config) => !!config.retrievable
   }),
-  stepSpeaker: () => ({
-    name: 'stepSpeaker',
-    label: 'Control Speaker in Discrete Steps',
-    type: 'BOOLEAN',
-    default: false,
-    advanced: true
-  }),
   supportedArmStates: () => ({
     name: 'supportedArmStates',
     label: 'Supported Arm States',