diff --git a/pkg/services/datasources/service/datasource_service.go b/pkg/services/datasources/service/datasource_service.go
index 1a12960103d..2803c1b178d 100644
--- a/pkg/services/datasources/service/datasource_service.go
+++ b/pkg/services/datasources/service/datasource_service.go
@@ -565,7 +565,7 @@ func awsServiceNamespace(dsType string) string {
 	switch dsType {
 	case models.DS_ES, models.DS_ES_OPEN_DISTRO, models.DS_ES_OPENSEARCH:
 		return "es"
-	case models.DS_PROMETHEUS:
+	case models.DS_PROMETHEUS, models.DS_ALERTMANAGER:
 		return "aps"
 	default:
 		panic(fmt.Sprintf("Unsupported datasource %q", dsType))
diff --git a/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx b/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx
index fdb4710782e..27598728a28 100644
--- a/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/alertmanager/ConfigEditor.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 
+import { SIGV4ConnectionConfig } from '@grafana/aws-sdk';
 import { DataSourcePluginOptionsEditorProps, SelectableValue } from '@grafana/data';
 import { DataSourceHttpSettings, InlineFormLabel, Select } from '@grafana/ui';
+import { config } from 'app/core/config';
 
 import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from './types';
 
@@ -21,7 +23,9 @@ const IMPL_OPTIONS: SelectableValue[] = [
   },
 ];
 
-export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
+export const ConfigEditor = (props: Props) => {
+  const { options, onOptionsChange } = props;
+
   return (
     <>
       <h3 className="page-heading">Alertmanager</h3>
@@ -51,6 +55,8 @@ export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
         dataSourceConfig={options}
         showAccessOptions={true}
         onChange={onOptionsChange}
+        sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
+        renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
       />
     </>
   );