diff --git a/include/etc/amavis/conf.d/90-dkim b/include/etc/amavis/conf.d/90-dkim
index f682d82..14fbb69 100644
--- a/include/etc/amavis/conf.d/90-dkim
+++ b/include/etc/amavis/conf.d/90-dkim
@@ -1,19 +1,3 @@
-dkim_key(
-    'example.org',
-    'dkim',
-    '/certs/amavis/dkim/example.org.dkim.pem'
-);
-
-
-@dkim_signature_options_bysender_maps = (
-    {
-        "example.org" => {
-            d   => 'example.org',
-            a   => 'rsa-sha256',
-            ttl => 10*24*3600
-        }
-    }
-);
 
 $enable_dkim_signing = 1;
 
diff --git a/include/etc/amavis/conf.d/99-dkim-keys b/include/etc/amavis/conf.d/99-dkim-keys
new file mode 100644
index 0000000..4b374a2
--- /dev/null
+++ b/include/etc/amavis/conf.d/99-dkim-keys
@@ -0,0 +1,18 @@
+dkim_key(
+    'example.org',
+    'dkim',
+    '/certs/amavis/dkim/example.org.dkim.pem'
+);
+
+
+@dkim_signature_options_bysender_maps = (
+    {
+        "example.org" => {
+            s   => 'dkim',
+            d   => 'example.org',
+            a   => 'rsa-sha256',
+            ttl => 10*24*3600
+        }
+    }
+);
+