diff --git a/.github/workflows/operator-ci.yml b/.github/workflows/operator-ci.yml
index e6dfc156b2b..ea1cdba4cc3 100644
--- a/.github/workflows/operator-ci.yml
+++ b/.github/workflows/operator-ci.yml
@@ -76,11 +76,11 @@ jobs:
         run: |
           eval $(minikube -p minikube docker-env)
           (cd quarkus/container && docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t keycloak:${{ steps.vars.outputs.version }})
-          (cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
+          (cd operator/app && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
 
       - name: Test operator running locally
         run: |
-          mvn -Poperator -pl operator -am clean verify \
+          mvn clean verify -Poperator -pl :keycloak-operator -am \
               -Dquarkus.kubernetes.deployment-target=kubernetes \
               -Doperator.keycloak.image=keycloak:${{ steps.vars.outputs.version }} \
               -Dtest.operator.custom.image=custom-keycloak:${{ steps.vars.outputs.version }} \
@@ -121,12 +121,12 @@ jobs:
         run: |
           eval $(minikube -p minikube docker-env)
           (cd quarkus/container && docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t keycloak:${{ steps.vars.outputs.version }})
-          (cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
+          (cd operator/app && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
 
       - name: Test operator running in cluster
         run: |
           eval $(minikube -p minikube docker-env)
-          mvn -Poperator -pl operator -am clean verify \
+          mvn clean verify -Poperator -pl :keycloak-operator -am \
               -Dquarkus.container-image.build=true \
               -Dquarkus.kubernetes.deployment-target=kubernetes \
               -Doperator.keycloak.image=keycloak:${{ steps.vars.outputs.version }} \
@@ -163,7 +163,7 @@ jobs:
       - name: Install Yq
         run: sudo snap install yq
       - name: Install OLM
-        working-directory: operator
+        working-directory: operator/app
         run: ./scripts/install-olm.sh
       - name: Download keycloak distribution
         id: download-keycloak-dist
@@ -172,13 +172,13 @@ jobs:
           name: keycloak-distribution
           path: quarkus/container
       - name: Arrange OLM test installation
-        working-directory: operator
+        working-directory: operator/app
         run: |
           eval $(minikube -p minikube docker-env)
           ./scripts/olm-testing.sh ${GITHUB_SHA::6}
 
       - name: Deploy an example Keycloak and wait for it to be ready
-        working-directory: operator
+        working-directory: operator/app
         run: |
           kubectl apply -f src/main/resources/example-postgres.yaml
           ./scripts/check-crds-installed.sh
diff --git a/config-api/pom.xml b/config-api/pom.xml
new file mode 100755
index 00000000000..0608f0e2762
--- /dev/null
+++ b/config-api/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+  ~ and other contributors as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>keycloak-config-api</artifactId>
+    <name>Keycloak Configuration API</name>
+    <packaging>jar</packaging>
+    <description/>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+</project>
diff --git a/config-api/src/main/java/org/keycloak/config/AllOptions.java b/config-api/src/main/java/org/keycloak/config/AllOptions.java
new file mode 100644
index 00000000000..a33e0657d14
--- /dev/null
+++ b/config-api/src/main/java/org/keycloak/config/AllOptions.java
@@ -0,0 +1,13 @@
+package org.keycloak.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AllOptions {
+
+    public final static List<Option<?>> ALL_OPTIONS = new ArrayList<>();
+
+    static {
+        ALL_OPTIONS.addAll(HttpOptions.ALL_OPTIONS);
+    }
+}
diff --git a/config-api/src/main/java/org/keycloak/config/HttpOptions.java b/config-api/src/main/java/org/keycloak/config/HttpOptions.java
new file mode 100644
index 00000000000..7dd7b1a8c56
--- /dev/null
+++ b/config-api/src/main/java/org/keycloak/config/HttpOptions.java
@@ -0,0 +1,20 @@
+package org.keycloak.config;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+public class HttpOptions {
+
+    public final static Option httpPort = new OptionBuilder<Integer>("http-port", Integer.class)
+            .description("The used HTTP port.")
+            .category(OptionCategory.HTTP)
+            .defaultValue(8080)
+            .build();
+
+    public final static List<Option<?>> ALL_OPTIONS = new ArrayList<>();
+
+    static {
+        ALL_OPTIONS.add(httpPort);
+    }
+}
diff --git a/config-api/src/main/java/org/keycloak/config/Option.java b/config-api/src/main/java/org/keycloak/config/Option.java
new file mode 100644
index 00000000000..2c67bf7a73a
--- /dev/null
+++ b/config-api/src/main/java/org/keycloak/config/Option.java
@@ -0,0 +1,65 @@
+package org.keycloak.config;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+public class Option<T> {
+
+    public enum Runtime {
+        QUARKUS,
+        DOCS,
+        OPERATOR;
+    }
+
+    private final Class<T> type;
+    private final String key;
+    private final OptionCategory category;
+    private final Set<Runtime> supportedRuntimes;
+    private final boolean buildTime;
+    private final String description;
+    private final Optional<T> defaultValue;
+    private final List<T> expectedValues;
+
+    public Option(Class<T> type, String key, OptionCategory category, Set<Runtime> supportedRuntimes, boolean buildTime, String description, Optional<T> defaultValue, List<T> expectedValues) {
+        this.type = type;
+        this.key = key;
+        this.category = category;
+        this.supportedRuntimes = supportedRuntimes;
+        this.buildTime = buildTime;
+        this.description = description;
+        this.defaultValue = defaultValue;
+        this.expectedValues = expectedValues;
+    }
+
+    public Class<T> getType() {
+        return type;
+    }
+
+    public Set<Runtime> getSupportedRuntimes() {
+        return supportedRuntimes;
+    }
+
+    public boolean isBuildTime() {
+        return buildTime;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public OptionCategory getCategory() {
+        return category;
+    }
+
+    public String getDescription() { return description; }
+
+    public Optional<T> getDefaultValue() {
+        return defaultValue;
+    }
+
+    public List<T> getExpectedValues() {
+        return expectedValues;
+    }
+
+}
diff --git a/config-api/src/main/java/org/keycloak/config/OptionBuilder.java b/config-api/src/main/java/org/keycloak/config/OptionBuilder.java
new file mode 100644
index 00000000000..89f440c9adc
--- /dev/null
+++ b/config-api/src/main/java/org/keycloak/config/OptionBuilder.java
@@ -0,0 +1,85 @@
+package org.keycloak.config;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class OptionBuilder<T> {
+    private Class<T> type;
+    private String key;
+    private OptionCategory category;
+    private Set<Option.Runtime> supportedRuntimes;
+    private boolean build;
+    private String description;
+    private Optional<T> defaultValue;
+    private List<T> expectedValues;
+
+    public OptionBuilder(String key, Class<T> type) {
+        this.type = type;
+        this.key = key;
+        category = OptionCategory.GENERAL;
+        supportedRuntimes = Arrays.stream(Option.Runtime.values()).collect(Collectors.toSet());
+        build = false;
+        description = "";
+        defaultValue = Optional.empty();
+        expectedValues = new ArrayList<>();
+    }
+
+    public OptionBuilder<T> category(OptionCategory category) {
+        this.category = category;
+        return this;
+    }
+
+    public OptionBuilder<T> runtimes(Option.Runtime ... runtimes) {
+        this.supportedRuntimes.clear();
+        this.supportedRuntimes.addAll(Arrays.asList(runtimes));
+        return this;
+    }
+
+    public OptionBuilder<T> runtimes(Set<Option.Runtime> runtimes) {
+        this.supportedRuntimes.clear();
+        this.supportedRuntimes.addAll(runtimes);
+        return this;
+    }
+
+    public OptionBuilder<T> buildTime(boolean build) {
+        this.build = build;
+        return this;
+    }
+
+    public OptionBuilder<T> description(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public OptionBuilder<T> defaultValue(Optional<T> defaultV) {
+        this.defaultValue = defaultV;
+        return this;
+    }
+
+    public OptionBuilder<T> defaultValue(T defaultV) {
+        this.defaultValue = Optional.ofNullable(defaultV);
+        return this;
+    }
+
+    public OptionBuilder<T> expectedValues(List<T> expected) {
+        this.expectedValues.clear();
+        this.expectedValues.addAll(expected);
+        return this;
+    }
+
+    public OptionBuilder<T> expectedValues(T ... expected) {
+        this.expectedValues.clear();
+        this.expectedValues.addAll(Arrays.asList(expected));
+        return this;
+    }
+
+    public Option<T> build() {
+        return new Option<T>(type, key, category, supportedRuntimes, build, description, defaultValue, expectedValues);
+    }
+
+}
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigCategory.java b/config-api/src/main/java/org/keycloak/config/OptionCategory.java
similarity index 83%
rename from quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigCategory.java
rename to config-api/src/main/java/org/keycloak/config/OptionCategory.java
index 30a9236898e..957d5dd0657 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigCategory.java
+++ b/config-api/src/main/java/org/keycloak/config/OptionCategory.java
@@ -1,6 +1,6 @@
-package org.keycloak.quarkus.runtime.configuration.mappers;
+package org.keycloak.config;
 
-public enum ConfigCategory {
+public enum OptionCategory {
     // ordered by name asc
     CLUSTERING("Cluster", 10),
     DATABASE("Database", 20),
@@ -20,7 +20,7 @@ public enum ConfigCategory {
     //Categories with a lower number are shown before groups with a higher number
     private final int order;
 
-    ConfigCategory(String heading, int order) {
+    OptionCategory(String heading, int order) {
         this.heading = heading; this.order = order;
     }
 
diff --git a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java
index a915b3e624c..0f71b65d60f 100644
--- a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java
+++ b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java
@@ -5,25 +5,22 @@ import static org.keycloak.quarkus.runtime.configuration.Configuration.toDashCas
 import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.keycloak.config.OptionCategory;
 import org.keycloak.provider.ProviderConfigProperty;
 import org.keycloak.provider.ProviderFactory;
 import org.keycloak.provider.ProviderManager;
 import org.keycloak.provider.Spi;
 import org.keycloak.quarkus.runtime.Providers;
 import org.keycloak.quarkus.runtime.configuration.Configuration;
-import org.keycloak.quarkus.runtime.configuration.mappers.ConfigCategory;
-import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper;
 import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -36,7 +33,7 @@ public class Options {
         options = PropertyMappers.getMappers().stream()
                 .filter(m -> !m.isHidden())
                 .filter(propertyMapper -> Objects.nonNull(propertyMapper.getDescription()))
-                .map(m -> new Option(m.getFrom(), m.getCategory(), m.isBuildTime(), m.getDescription(), m.getDefaultValue(), m.getExpectedValues()))
+                .map(m -> new Option(m.getFrom(), m.getCategory(), m.isBuildTime(), m.getDescription(), (String) m.getDefaultValue().map(d -> d.toString()).orElse(null), m.getExpectedValues()))
                 .sorted(Comparator.comparing(Option::getKey))
                 .collect(Collectors.toMap(Option::getKey, o -> o, (o1, o2) -> o1, LinkedHashMap::new)); // Need to ignore duplicate keys??
         ProviderManager providerManager = Providers.getProviderManager(Thread.currentThread().getContextClassLoader());
@@ -51,7 +48,7 @@ public class Options {
 
                 String optionPrefix = NS_KEYCLOAK_PREFIX + String.join(OPTION_PART_SEPARATOR, ArrayUtils.insert(0, new String[] {loadSpi.getName(), providerFactory.getId()}, "spi"));
                 List<Option> options = configMetadata.stream()
-                        .map(m -> new Option(Configuration.toDashCase(optionPrefix.concat("-") + m.getName()), ConfigCategory.GENERAL, false,
+                        .map(m -> new Option(Configuration.toDashCase(optionPrefix.concat("-") + m.getName()), OptionCategory.GENERAL, false,
                                 m.getHelpText(),
                                 m.getDefaultValue() == null ? "none" : m.getDefaultValue().toString(),
                                 m.getOptions() == null ? (m.getType() == null ? Collections.emptyList() : Collections.singletonList(m.getType())) : m.getOptions()))
@@ -64,15 +61,15 @@ public class Options {
         }
     }
 
-    public ConfigCategory[] getCategories() {
-        return ConfigCategory.values();
+    public OptionCategory[] getCategories() {
+        return OptionCategory.values();
     }
 
     public Collection<Option> getValues() {
         return options.values();
     }
 
-    public Collection<Option> getValues(ConfigCategory category) {
+    public Collection<Option> getValues(OptionCategory category) {
         return options.values().stream().filter(o -> o.category.equals(category)).collect(Collectors.toList());
     }
 
@@ -92,13 +89,13 @@ public class Options {
     public class Option {
 
         private String key;
-        private ConfigCategory category;
+        private OptionCategory category;
         private boolean build;
         private String description;
         private String defaultValue;
         private List<String> expectedValues;
 
-        public Option(String key, ConfigCategory category, boolean build, String description, String defaultValue, Iterable<String> expectedValues) {
+        public Option(String key, OptionCategory category, boolean build, String description, String defaultValue, Iterable<String> expectedValues) {
             this.key = key;
             this.category = category;
             this.build = build;
diff --git a/operator/.gitignore b/operator/app/.gitignore
similarity index 100%
rename from operator/.gitignore
rename to operator/app/.gitignore
diff --git a/operator/olm-base/bundle.Dockerfile b/operator/app/olm-base/bundle.Dockerfile
similarity index 100%
rename from operator/olm-base/bundle.Dockerfile
rename to operator/app/olm-base/bundle.Dockerfile
diff --git a/operator/olm-base/manifests/clusterserviceversion.yaml b/operator/app/olm-base/manifests/clusterserviceversion.yaml
similarity index 100%
rename from operator/olm-base/manifests/clusterserviceversion.yaml
rename to operator/app/olm-base/manifests/clusterserviceversion.yaml
diff --git a/operator/olm-base/metadata/annotations.yaml b/operator/app/olm-base/metadata/annotations.yaml
similarity index 100%
rename from operator/olm-base/metadata/annotations.yaml
rename to operator/app/olm-base/metadata/annotations.yaml
diff --git a/operator/overlays/default-namespace/kustomization.yaml b/operator/app/overlays/default-namespace/kustomization.yaml
similarity index 100%
rename from operator/overlays/default-namespace/kustomization.yaml
rename to operator/app/overlays/default-namespace/kustomization.yaml
diff --git a/operator/patch-sources.sh b/operator/app/patch-sources.sh
similarity index 100%
rename from operator/patch-sources.sh
rename to operator/app/patch-sources.sh
diff --git a/operator/app/pom.xml b/operator/app/pom.xml
new file mode 100644
index 00000000000..2ce99c4b84b
--- /dev/null
+++ b/operator/app/pom.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>keycloak-operator-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <name>Keycloak Operator</name>
+    <artifactId>keycloak-operator</artifactId>
+
+    <properties>
+        <!--
+            Override versions based on Quarkus dependencies.
+            Make sure to update these dependencies when Quarkus version changes.
+            See https://github.com/quarkusio/quarkus/blob/<versionTag>/bom/application/pom.xml
+            for reference
+        -->
+        <resteasy.version>4.7.5.Final</resteasy.version>
+        <wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>
+        <jackson.version>2.13.2</jackson.version>
+        <jackson.databind.version>2.13.2.2</jackson.databind.version>
+        <kubernetes-client.version>5.12.2</kubernetes-client.version>
+
+        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <quarkus.operator.sdk.version>3.0.7</quarkus.operator.sdk.version>
+        <quarkus.version>2.7.5.Final</quarkus.version>
+        <quarkus.container-image.group>keycloak</quarkus.container-image.group>
+        <quarkus.jib.base-jvm-image>registry.access.redhat.com/ubi8/openjdk-11-runtime</quarkus.jib.base-jvm-image>
+        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+    </properties>
+    
+    <dependencyManagement>
+        <dependencies>
+        <dependency>
+            <groupId>io.quarkiverse.operatorsdk</groupId>
+            <artifactId>quarkus-operator-sdk-bom</artifactId>
+            <version>${quarkus.operator.sdk.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <dependencies>
+        <!-- Fabric8 -->
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>crd-generator-api</artifactId>
+            <version>${kubernetes-client.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>crd-generator-apt</artifactId>
+            <version>${kubernetes-client.version}</version>
+        </dependency>
+
+        <!-- Quarkus -->
+        <dependency>
+            <groupId>io.quarkiverse.operatorsdk</groupId>
+            <artifactId>quarkus-operator-sdk</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.operatorsdk</groupId>
+            <artifactId>quarkus-operator-sdk-csv-generator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-minikube</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client</artifactId>
+        </dependency>
+
+
+        <!--  This dependency is needed only to ensure proper building order so that this module is build after the CSV extension -->
+        <dependency>
+            <groupId>io.quarkiverse.operatorsdk</groupId>
+            <artifactId>quarkus-operator-sdk-csv-generator-deployment</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Keycloak -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-common</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-common</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus.version}</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${compiler-plugin.version}</version>
+            </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-operator-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-server-config</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>keycloak-operator-codegen</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus.version}</version>
+                <executions>
+                    <execution>
+                    <goals>
+                        <goal>build</goal>
+                    </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target</outputDirectory>
+                            <resources>
+                            <resource>
+                                <directory>src/main/kubernetes</directory>
+                                <filtering>true</filtering>
+                            </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>import-keycloak-core</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/keycloak-core</outputDirectory>
+                            <resources>
+                            <resource>
+                                <directory>${basedir}/../../core/src/main/java</directory>
+                                <filtering>true</filtering>
+                            </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/target/keycloak-core</source>
+                                <source>${basedir}/target/generated-sources/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <version>1.6.0</version>
+                <executions>
+                    <execution>
+                        <id>patch-core-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>${basedir}/patch-sources.sh</executable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    
+    <profiles>
+        <profile>
+            <id>native</id>
+            <properties>
+            <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+        </profile>
+    </profiles>
+</project>
diff --git a/operator/scripts/Dockerfile-custom-image b/operator/app/scripts/Dockerfile-custom-image
similarity index 100%
rename from operator/scripts/Dockerfile-custom-image
rename to operator/app/scripts/Dockerfile-custom-image
diff --git a/operator/scripts/build-testing-docker-images.sh b/operator/app/scripts/build-testing-docker-images.sh
similarity index 100%
rename from operator/scripts/build-testing-docker-images.sh
rename to operator/app/scripts/build-testing-docker-images.sh
diff --git a/operator/scripts/check-crds-installed.sh b/operator/app/scripts/check-crds-installed.sh
similarity index 100%
rename from operator/scripts/check-crds-installed.sh
rename to operator/app/scripts/check-crds-installed.sh
diff --git a/operator/scripts/check-examples-installed.sh b/operator/app/scripts/check-examples-installed.sh
similarity index 100%
rename from operator/scripts/check-examples-installed.sh
rename to operator/app/scripts/check-examples-installed.sh
diff --git a/operator/scripts/create-olm-bundle.sh b/operator/app/scripts/create-olm-bundle.sh
similarity index 100%
rename from operator/scripts/create-olm-bundle.sh
rename to operator/app/scripts/create-olm-bundle.sh
diff --git a/operator/scripts/create-olm-test-catalog.sh b/operator/app/scripts/create-olm-test-catalog.sh
similarity index 100%
rename from operator/scripts/create-olm-test-catalog.sh
rename to operator/app/scripts/create-olm-test-catalog.sh
diff --git a/operator/scripts/create-olm-test-resources.sh b/operator/app/scripts/create-olm-test-resources.sh
similarity index 100%
rename from operator/scripts/create-olm-test-resources.sh
rename to operator/app/scripts/create-olm-test-resources.sh
diff --git a/operator/scripts/install-keycloak-operator.sh b/operator/app/scripts/install-keycloak-operator.sh
similarity index 100%
rename from operator/scripts/install-keycloak-operator.sh
rename to operator/app/scripts/install-keycloak-operator.sh
diff --git a/operator/scripts/install-olm.sh b/operator/app/scripts/install-olm.sh
similarity index 100%
rename from operator/scripts/install-olm.sh
rename to operator/app/scripts/install-olm.sh
diff --git a/operator/scripts/olm-testing.sh b/operator/app/scripts/olm-testing.sh
similarity index 89%
rename from operator/scripts/olm-testing.sh
rename to operator/app/scripts/olm-testing.sh
index 7c98a812023..ad93d10411f 100755
--- a/operator/scripts/olm-testing.sh
+++ b/operator/app/scripts/olm-testing.sh
@@ -10,7 +10,7 @@ VERSION="86400000.0.0"
 
 # Build Keycloak Docker image (the keycloak tar.gz should already be in the container folder)
 (
-  cd $SCRIPT_DIR/../../quarkus/container
+  cd $SCRIPT_DIR/../../../quarkus/container
   
   docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t "ttl.sh/${UUID}keycloak:${VERSION}"
   docker push "ttl.sh/${UUID}keycloak:${VERSION}"
@@ -18,8 +18,8 @@ VERSION="86400000.0.0"
 
 # Build the operator Docker image
 (
-  cd $SCRIPT_DIR/../
-  mvn clean package \
+  cd $SCRIPT_DIR/../../
+  mvn clean package -pl :keycloak-operator -am \
     -Dquarkus.container-image.build=true \
     -Dquarkus.container-image.image="ttl.sh/${UUID}keycloak-operator:${VERSION}" \
     -Doperator.keycloak.image="ttl.sh/${UUID}keycloak:${VERSION}" \
diff --git a/operator/scripts/prepare-olm-test.sh b/operator/app/scripts/prepare-olm-test.sh
similarity index 100%
rename from operator/scripts/prepare-olm-test.sh
rename to operator/app/scripts/prepare-olm-test.sh
diff --git a/operator/src/main/java/org/keycloak/operator/Config.java b/operator/app/src/main/java/org/keycloak/operator/Config.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/Config.java
rename to operator/app/src/main/java/org/keycloak/operator/Config.java
diff --git a/operator/src/main/java/org/keycloak/operator/Constants.java b/operator/app/src/main/java/org/keycloak/operator/Constants.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/Constants.java
rename to operator/app/src/main/java/org/keycloak/operator/Constants.java
diff --git a/operator/src/main/java/org/keycloak/operator/OperatorManagedResource.java b/operator/app/src/main/java/org/keycloak/operator/OperatorManagedResource.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/OperatorManagedResource.java
rename to operator/app/src/main/java/org/keycloak/operator/OperatorManagedResource.java
diff --git a/operator/src/main/java/org/keycloak/operator/StatusUpdater.java b/operator/app/src/main/java/org/keycloak/operator/StatusUpdater.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/StatusUpdater.java
rename to operator/app/src/main/java/org/keycloak/operator/StatusUpdater.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakAdminSecret.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakAdminSecret.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakAdminSecret.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakAdminSecret.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakController.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakController.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakController.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakController.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDeployment.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDeployment.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDeployment.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDeployment.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDiscoveryService.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDiscoveryService.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDiscoveryService.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakDiscoveryService.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakIngress.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakIngress.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakIngress.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakIngress.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportController.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportController.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportController.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportController.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportJob.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportJob.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportJob.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportJob.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportSecret.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportSecret.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportSecret.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportSecret.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakService.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakService.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakService.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/KeycloakService.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/WatchedSecretsStore.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/WatchedSecretsStore.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/WatchedSecretsStore.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/WatchedSecretsStore.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/Keycloak.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/Keycloak.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/Keycloak.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/Keycloak.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImport.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImport.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImport.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImport.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportSpec.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportSpec.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportSpec.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportSpec.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatus.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatus.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatus.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatus.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusBuilder.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusBuilder.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusBuilder.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusBuilder.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusCondition.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusCondition.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusCondition.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakRealmImportStatusCondition.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakSpec.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakSpec.java
similarity index 95%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakSpec.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakSpec.java
index 4e32deded8b..e7fe6725bc6 100644
--- a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakSpec.java
+++ b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakSpec.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 
 import org.keycloak.operator.Constants;
+import org.keycloak.operator.codegen.configuration.ServerConfig;
 import org.keycloak.operator.v2alpha1.crds.keycloakspec.Unsupported;
 
 import javax.validation.constraints.NotNull;
@@ -35,6 +36,9 @@ public class KeycloakSpec {
             "expressed as a keys (reference: https://www.keycloak.org/server/all-config) and values that can be either direct values or references to secrets.")
     private List<ValueOrSecret> serverConfiguration; // can't use Set due to a bug in Sundrio https://github.com/sundrio/sundrio/issues/316
 
+    // TODO: switch to this serverConfig when all the options are ported
+    // private ServerConfig serverConfig;
+
     @NotNull
     @JsonPropertyDescription("Hostname for the Keycloak server.\n" +
             "The special value `" + Constants.INSECURE_DISABLE + "` disables the hostname strict resolution.")
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatus.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatus.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatus.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatus.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusBuilder.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusBuilder.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusBuilder.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusBuilder.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusCondition.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusCondition.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusCondition.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakStatusCondition.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/ValueOrSecret.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/ValueOrSecret.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/ValueOrSecret.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/ValueOrSecret.java
diff --git a/operator/src/main/java/org/keycloak/operator/v2alpha1/crds/keycloakspec/Unsupported.java b/operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/keycloakspec/Unsupported.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/operator/v2alpha1/crds/keycloakspec/Unsupported.java
rename to operator/app/src/main/java/org/keycloak/operator/v2alpha1/crds/keycloakspec/Unsupported.java
diff --git a/operator/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java b/operator/app/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java
rename to operator/app/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java
diff --git a/operator/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java b/operator/app/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java
rename to operator/app/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java
diff --git a/operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java b/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java
rename to operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java
diff --git a/operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java b/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java
rename to operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java
diff --git a/operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java b/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java
rename to operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java
diff --git a/operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java b/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java
similarity index 100%
rename from operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java
rename to operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java
diff --git a/operator/src/main/kubernetes/kubernetes.yml b/operator/app/src/main/kubernetes/kubernetes.yml
similarity index 100%
rename from operator/src/main/kubernetes/kubernetes.yml
rename to operator/app/src/main/kubernetes/kubernetes.yml
diff --git a/operator/src/main/kubernetes/kustomization.yml b/operator/app/src/main/kubernetes/kustomization.yml
similarity index 100%
rename from operator/src/main/kubernetes/kustomization.yml
rename to operator/app/src/main/kubernetes/kustomization.yml
diff --git a/operator/src/main/resources/application.properties b/operator/app/src/main/resources/application.properties
similarity index 100%
rename from operator/src/main/resources/application.properties
rename to operator/app/src/main/resources/application.properties
diff --git a/operator/src/main/resources/base-keycloak-deployment.yaml b/operator/app/src/main/resources/base-keycloak-deployment.yaml
similarity index 100%
rename from operator/src/main/resources/base-keycloak-deployment.yaml
rename to operator/app/src/main/resources/base-keycloak-deployment.yaml
diff --git a/operator/src/main/resources/example-db-secret.yaml b/operator/app/src/main/resources/example-db-secret.yaml
similarity index 100%
rename from operator/src/main/resources/example-db-secret.yaml
rename to operator/app/src/main/resources/example-db-secret.yaml
diff --git a/operator/src/main/resources/example-keycloak.yaml b/operator/app/src/main/resources/example-keycloak.yaml
similarity index 100%
rename from operator/src/main/resources/example-keycloak.yaml
rename to operator/app/src/main/resources/example-keycloak.yaml
diff --git a/operator/src/main/resources/example-postgres.yaml b/operator/app/src/main/resources/example-postgres.yaml
similarity index 100%
rename from operator/src/main/resources/example-postgres.yaml
rename to operator/app/src/main/resources/example-postgres.yaml
diff --git a/operator/src/main/resources/example-realm.yaml b/operator/app/src/main/resources/example-realm.yaml
similarity index 100%
rename from operator/src/main/resources/example-realm.yaml
rename to operator/app/src/main/resources/example-realm.yaml
diff --git a/operator/src/main/resources/example-tls-secret.yaml b/operator/app/src/main/resources/example-tls-secret.yaml
similarity index 100%
rename from operator/src/main/resources/example-tls-secret.yaml
rename to operator/app/src/main/resources/example-tls-secret.yaml
diff --git a/operator/src/test/java/org/keycloak/operator/CRSerializationTest.java b/operator/app/src/test/java/org/keycloak/operator/CRSerializationTest.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/CRSerializationTest.java
rename to operator/app/src/test/java/org/keycloak/operator/CRSerializationTest.java
diff --git a/operator/src/test/java/org/keycloak/operator/ClusterOperatorTest.java b/operator/app/src/test/java/org/keycloak/operator/ClusterOperatorTest.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/ClusterOperatorTest.java
rename to operator/app/src/test/java/org/keycloak/operator/ClusterOperatorTest.java
diff --git a/operator/src/test/java/org/keycloak/operator/ClusteringE2EIT.java b/operator/app/src/test/java/org/keycloak/operator/ClusteringE2EIT.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/ClusteringE2EIT.java
rename to operator/app/src/test/java/org/keycloak/operator/ClusteringE2EIT.java
diff --git a/operator/src/test/java/org/keycloak/operator/KeycloakDeploymentE2EIT.java b/operator/app/src/test/java/org/keycloak/operator/KeycloakDeploymentE2EIT.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/KeycloakDeploymentE2EIT.java
rename to operator/app/src/test/java/org/keycloak/operator/KeycloakDeploymentE2EIT.java
diff --git a/operator/src/test/java/org/keycloak/operator/KeycloakIngressE2EIT.java b/operator/app/src/test/java/org/keycloak/operator/KeycloakIngressE2EIT.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/KeycloakIngressE2EIT.java
rename to operator/app/src/test/java/org/keycloak/operator/KeycloakIngressE2EIT.java
diff --git a/operator/src/test/java/org/keycloak/operator/KeycloakServicesE2EIT.java b/operator/app/src/test/java/org/keycloak/operator/KeycloakServicesE2EIT.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/KeycloakServicesE2EIT.java
rename to operator/app/src/test/java/org/keycloak/operator/KeycloakServicesE2EIT.java
diff --git a/operator/src/test/java/org/keycloak/operator/PodTemplateE2EIT.java b/operator/app/src/test/java/org/keycloak/operator/PodTemplateE2EIT.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/PodTemplateE2EIT.java
rename to operator/app/src/test/java/org/keycloak/operator/PodTemplateE2EIT.java
diff --git a/operator/src/test/java/org/keycloak/operator/PodTemplateTest.java b/operator/app/src/test/java/org/keycloak/operator/PodTemplateTest.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/PodTemplateTest.java
rename to operator/app/src/test/java/org/keycloak/operator/PodTemplateTest.java
diff --git a/operator/src/test/java/org/keycloak/operator/RealmImportE2EIT.java b/operator/app/src/test/java/org/keycloak/operator/RealmImportE2EIT.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/RealmImportE2EIT.java
rename to operator/app/src/test/java/org/keycloak/operator/RealmImportE2EIT.java
diff --git a/operator/src/test/java/org/keycloak/operator/WatchedSecretsTestE2EIT.java b/operator/app/src/test/java/org/keycloak/operator/WatchedSecretsTestE2EIT.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/WatchedSecretsTestE2EIT.java
rename to operator/app/src/test/java/org/keycloak/operator/WatchedSecretsTestE2EIT.java
diff --git a/operator/src/test/java/org/keycloak/operator/utils/CRAssert.java b/operator/app/src/test/java/org/keycloak/operator/utils/CRAssert.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/utils/CRAssert.java
rename to operator/app/src/test/java/org/keycloak/operator/utils/CRAssert.java
diff --git a/operator/src/test/java/org/keycloak/operator/utils/K8sUtils.java b/operator/app/src/test/java/org/keycloak/operator/utils/K8sUtils.java
similarity index 100%
rename from operator/src/test/java/org/keycloak/operator/utils/K8sUtils.java
rename to operator/app/src/test/java/org/keycloak/operator/utils/K8sUtils.java
diff --git a/operator/src/test/resources/application.properties b/operator/app/src/test/resources/application.properties
similarity index 100%
rename from operator/src/test/resources/application.properties
rename to operator/app/src/test/resources/application.properties
diff --git a/operator/src/test/resources/correct-podtemplate-keycloak.yml b/operator/app/src/test/resources/correct-podtemplate-keycloak.yml
similarity index 100%
rename from operator/src/test/resources/correct-podtemplate-keycloak.yml
rename to operator/app/src/test/resources/correct-podtemplate-keycloak.yml
diff --git a/operator/src/test/resources/empty-podtemplate-keycloak.yml b/operator/app/src/test/resources/empty-podtemplate-keycloak.yml
similarity index 100%
rename from operator/src/test/resources/empty-podtemplate-keycloak.yml
rename to operator/app/src/test/resources/empty-podtemplate-keycloak.yml
diff --git a/operator/src/test/resources/incorrect-realm.yaml b/operator/app/src/test/resources/incorrect-realm.yaml
similarity index 100%
rename from operator/src/test/resources/incorrect-realm.yaml
rename to operator/app/src/test/resources/incorrect-realm.yaml
diff --git a/operator/src/test/resources/test-serialization-keycloak-cr.yml b/operator/app/src/test/resources/test-serialization-keycloak-cr.yml
similarity index 100%
rename from operator/src/test/resources/test-serialization-keycloak-cr.yml
rename to operator/app/src/test/resources/test-serialization-keycloak-cr.yml
diff --git a/operator/src/test/resources/token-test-realm.yaml b/operator/app/src/test/resources/token-test-realm.yaml
similarity index 100%
rename from operator/src/test/resources/token-test-realm.yaml
rename to operator/app/src/test/resources/token-test-realm.yaml
diff --git a/operator/maven-plugin/pom.xml b/operator/maven-plugin/pom.xml
new file mode 100644
index 00000000000..8166c4f15d1
--- /dev/null
+++ b/operator/maven-plugin/pom.xml
@@ -0,0 +1,66 @@
+
+<!--
+  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+  ~ and other contributors as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>keycloak-operator-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>Keycloak Operator Maven Plugin</name>
+    <artifactId>keycloak-operator-maven-plugin</artifactId>
+    <description>Keycloak Operator Maven Plugin</description>
+    <packaging>maven-plugin</packaging>
+
+    <dependencies>
+        <!-- Maven Plugin Dependencies -->
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <version>3.6.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+
+        <!-- Keycloak Dependencies -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-config-api</artifactId>
+        </dependency>
+
+        <!-- Codegen Dependencies -->
+        <dependency>
+            <groupId>com.github.javaparser</groupId>
+            <artifactId>javaparser-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/CodegenMojo.java b/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/CodegenMojo.java
new file mode 100644
index 00000000000..5d4bb27fb1b
--- /dev/null
+++ b/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/CodegenMojo.java
@@ -0,0 +1,32 @@
+package org.keycloak.operator.maven;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+import java.io.File;
+
+@Mojo(name = "keycloak-operator-codegen", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+public class CodegenMojo extends AbstractMojo {
+
+    @Parameter(property = "operator.codegen.target", defaultValue = "${basedir}/target/generated-sources/java")
+    private File target;
+
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        try {
+            Log log = getLog();
+
+            ServerConfigGen serverConfigGen = new ServerConfigGen();
+
+            serverConfigGen.generate(log, target);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MojoFailureException("Failed to generate code", e);
+        }
+    }
+}
diff --git a/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/ServerConfigGen.java b/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/ServerConfigGen.java
new file mode 100644
index 00000000000..3a608e5778d
--- /dev/null
+++ b/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/ServerConfigGen.java
@@ -0,0 +1,83 @@
+package org.keycloak.operator.maven;
+
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.Modifier;
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
+import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.expr.StringLiteralExpr;
+import com.github.javaparser.utils.StringEscapeUtils;
+import org.apache.maven.plugin.logging.Log;
+import org.keycloak.config.AllOptions;
+import org.keycloak.config.Option;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public class ServerConfigGen {
+
+    public static final String ANNOTATION_JSON_PROPERTY = "com.fasterxml.jackson.annotation.JsonProperty";
+    public static final String ANNOTATION_JSON_PROPERTY_DESCRIPTION = "com.fasterxml.jackson.annotation.JsonPropertyDescription";
+
+    public void generate(Log log, File destination) {
+        String className = "ServerConfig";
+        String[] packageName = new String[]{"org", "keycloak", "operator", "codegen", "configuration"};
+        CompilationUnit cu = new CompilationUnit();
+        cu.setPackageDeclaration(String.join(".", packageName));
+
+        ClassOrInterfaceDeclaration serverConfig = cu.addClass(className);
+
+        Path dest = Paths.get(destination.getAbsolutePath(), packageName);
+        dest.toFile().mkdirs();
+
+        AllOptions.ALL_OPTIONS.forEach(o -> {
+            if (o.getSupportedRuntimes().contains(Option.Runtime.OPERATOR)) {
+                String fieldName = toCamelCase(o.getKey());
+
+                FieldDeclaration field = serverConfig.addField(o.getType().getCanonicalName(), fieldName, Modifier.Keyword.PRIVATE);
+                field.addSingleMemberAnnotation(
+                        ANNOTATION_JSON_PROPERTY,
+                        new StringLiteralExpr(o.getKey()));
+                field.addSingleMemberAnnotation(
+                        ANNOTATION_JSON_PROPERTY_DESCRIPTION,
+                        new StringLiteralExpr(StringEscapeUtils.escapeJava(o.getDescription())));
+                field.createGetter();
+                field.createSetter();
+            }
+        });
+
+        writeToFile(dest.resolve(className + ".java").toFile(), cu.toString());
+    }
+
+    private void writeToFile(File file, String str) {
+        try (FileWriter fileWriter = new FileWriter(file);
+             PrintWriter printWriter = new PrintWriter(fileWriter)) {
+            printWriter.println(str);
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private String toCamelCase(String original) {
+        boolean convertNext = false;
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < original.length(); i++) {
+            char currentChar = original.charAt(i);
+            if (currentChar == '-') {
+                convertNext = true;
+            } else if (convertNext) {
+                builder.append(Character.toUpperCase(currentChar));
+                convertNext = false;
+            } else {
+                builder.append(Character.toLowerCase(currentChar));
+            }
+        }
+        return builder.toString();
+    }
+
+}
diff --git a/operator/pom.xml b/operator/pom.xml
old mode 100644
new mode 100755
index 51781edd807..666a3d6e87a
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -1,272 +1,36 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-
+<!--
+  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+  ~ and other contributors as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    
-    <name>Keycloak Operator</name>
-    <artifactId>keycloak-operator</artifactId>
+    <name>Keycloak Operator Parent</name>
+    <description/>
+    <modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <!--
-            Override versions based on Quarkus dependencies.
-            Make sure to update these dependencies when Quarkus version changes.
-            See https://github.com/quarkusio/quarkus/blob/<versionTag>/bom/application/pom.xml
-            for reference
-        -->
-        <resteasy.version>4.7.5.Final</resteasy.version>
-        <wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>
-        <jackson.version>2.13.2</jackson.version>
-        <jackson.databind.version>2.13.2.2</jackson.databind.version>
-        <kubernetes-client.version>5.12.2</kubernetes-client.version>
+    <artifactId>keycloak-operator-parent</artifactId>
+    <packaging>pom</packaging>
 
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-        <maven.compiler.release>11</maven.compiler.release>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.operator.sdk.version>3.0.7</quarkus.operator.sdk.version>
-        <quarkus.version>2.7.5.Final</quarkus.version>
-        <quarkus.container-image.group>keycloak</quarkus.container-image.group>
-        <quarkus.jib.base-jvm-image>registry.access.redhat.com/ubi8/openjdk-11-runtime</quarkus.jib.base-jvm-image>
-        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
-    </properties>
-    
-    <dependencyManagement>
-        <dependencies>
-        <dependency>
-            <groupId>io.quarkiverse.operatorsdk</groupId>
-            <artifactId>quarkus-operator-sdk-bom</artifactId>
-            <version>${quarkus.operator.sdk.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-
-    <dependencies>
-        <!-- Fabric8 -->
-        <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>crd-generator-api</artifactId>
-            <version>${kubernetes-client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>crd-generator-apt</artifactId>
-            <version>${kubernetes-client.version}</version>
-        </dependency>
-
-        <!-- Quarkus -->
-        <dependency>
-            <groupId>io.quarkiverse.operatorsdk</groupId>
-            <artifactId>quarkus-operator-sdk</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkiverse.operatorsdk</groupId>
-            <artifactId>quarkus-operator-sdk-csv-generator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-openshift</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-minikube</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-kubernetes-client</artifactId>
-        </dependency>
-
-
-        <!--  This dependency is needed only to ensure proper building order so that this module is build after the CSV extension -->
-        <dependency>
-            <groupId>io.quarkiverse.operatorsdk</groupId>
-            <artifactId>quarkus-operator-sdk-csv-generator-deployment</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Keycloak -->
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-common</artifactId>
-        </dependency>
-
-        <!-- Test -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-common</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
-            </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
-                <executions>
-                    <execution>
-                    <goals>
-                        <goal>build</goal>
-                    </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target</outputDirectory>
-                            <resources>
-                            <resource>
-                                <directory>src/main/kubernetes</directory>
-                                <filtering>true</filtering>
-                            </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>import-keycloak-core</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/keycloak-core</outputDirectory>
-                            <resources>
-                            <resource>
-                                <directory>${basedir}/../core/src/main/java</directory>
-                                <filtering>true</filtering>
-                            </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${basedir}/target/keycloak-core</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
-                <groupId>org.codehaus.mojo</groupId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>patch-core-sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>${basedir}/patch-sources.sh</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${maven-failsafe-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-    
-    <profiles>
-        <profile>
-            <id>native</id>
-            <properties>
-            <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-        </profile>
-    </profiles>
+    <modules>
+        <module>maven-plugin</module>
+        <module>app</module>
+    </modules>
 </project>
diff --git a/pom.xml b/pom.xml
index 6bf39d510f3..e16309f47f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
         <apacheds.codec.version>2.0.0</apacheds.codec.version>
         <google.zxing.version>3.4.0</google.zxing.version>
         <freemarker.version>2.3.31</freemarker.version>
+        <javaparser.version>3.24.2</javaparser.version>
 
         <jetty9.version>${jetty94.version}</jetty9.version>
         <liquibase.version>4.8.0</liquibase.version>
@@ -1028,6 +1029,11 @@
                 <artifactId>keycloak-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-config-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-client-api</artifactId>
@@ -1596,6 +1602,11 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commons-io.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.javaparser</groupId>
+                <artifactId>javaparser-core</artifactId>
+                <version>${javaparser.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.eclipse.microprofile.metrics</groupId>
@@ -1871,6 +1882,16 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>config-api</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <modules>
+                <module>config-api</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>quarkus</id>
             <activation>
diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml
index a4489b3fb6b..7ecc8f039c7 100644
--- a/quarkus/runtime/pom.xml
+++ b/quarkus/runtime/pom.xml
@@ -251,6 +251,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-config-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- Keycloak Dependencies-->
         <dependency>
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java
index e3182d860ff..5814fa5b3c7 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java
@@ -47,6 +47,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.keycloak.config.OptionCategory;
 import org.keycloak.quarkus.runtime.cli.command.Build;
 import org.keycloak.quarkus.runtime.cli.command.ImportRealmMixin;
 import org.keycloak.quarkus.runtime.cli.command.Main;
@@ -55,7 +56,6 @@ import org.keycloak.quarkus.runtime.cli.command.StartDev;
 import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource;
 import org.keycloak.quarkus.runtime.configuration.PersistedConfigSource;
 import org.keycloak.quarkus.runtime.configuration.QuarkusPropertiesConfigSource;
-import org.keycloak.quarkus.runtime.configuration.mappers.ConfigCategory;
 import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers;
 import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper;
 import org.keycloak.quarkus.runtime.Environment;
@@ -259,7 +259,7 @@ public final class Picocli {
             if (runtimeValue == null && isNotBlank(persistedValue)) {
                 PropertyMapper mapper = PropertyMappers.getMapper(propertyName);
 
-                if (mapper != null && persistedValue.equals(mapper.getDefaultValue())) {
+                if (mapper != null && persistedValue.equals(mapper.getDefaultValue().orElse(null))) {
                     // same as default
                     continue;
                 }
@@ -381,7 +381,7 @@ public final class Picocli {
     }
 
     private static void addMappedOptionsToArgGroups(CommandSpec cSpec, List<PropertyMapper> propertyMappers) {
-        for(ConfigCategory category : ConfigCategory.values()) {
+        for(OptionCategory category : OptionCategory.values()) {
             List<PropertyMapper> mappersInCategory = propertyMappers.stream()
                     .filter(m -> category.equals(m.getCategory()))
                     .collect(Collectors.toList());
@@ -405,18 +405,26 @@ public final class Picocli {
                     continue;
                 }
 
-                String defaultValue = mapper.getDefaultValue();
                 Iterable<String> expectedValues = mapper.getExpectedValues();
 
-                argGroupBuilder.addArg(OptionSpec.builder(name)
-                        .defaultValue(defaultValue)
+                OptionSpec.Builder optBuilder = OptionSpec.builder(name)
                         .description(description)
                         .paramLabel(mapper.getParamLabel())
                         .completionCandidates(expectedValues)
                         .parameterConsumer(PropertyMapperParameterConsumer.INSTANCE)
-                        .type(String.class)
-                        .hidden(mapper.isHidden())
-                        .build());
+                        .hidden(mapper.isHidden());
+
+                if (mapper.getDefaultValue().isPresent()) {
+                    optBuilder.defaultValue(mapper.getDefaultValue().get().toString());
+                }
+
+                if (mapper.getType() != null) {
+                    optBuilder.type(mapper.getType());
+                } else {
+                    optBuilder.type(String.class);
+                }
+
+                argGroupBuilder.addArg(optBuilder.build());
             }
 
             cSpec.addArgGroup(argGroupBuilder.build());
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClusteringPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClusteringPropertyMappers.java
index 2681cb0c1db..33f824944f6 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClusteringPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClusteringPropertyMappers.java
@@ -3,6 +3,7 @@ package org.keycloak.quarkus.runtime.configuration.mappers;
 import java.util.Arrays;
 import java.util.function.BiFunction;
 
+import org.keycloak.config.OptionCategory;
 import org.keycloak.quarkus.runtime.Environment;
 
 import io.smallrye.config.ConfigSourceInterceptorContext;
@@ -64,6 +65,6 @@ final class ClusteringPropertyMappers {
     }
 
     private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.CLUSTERING);
+        return PropertyMapper.builder(OptionCategory.CLUSTERING);
     }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java
index a9d1a6c74b3..ba19b5ae6f7 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java
@@ -3,6 +3,7 @@ package org.keycloak.quarkus.runtime.configuration.mappers;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
 import io.smallrye.config.ConfigSourceInterceptorContext;
 import io.smallrye.config.ConfigValue;
+import org.keycloak.config.OptionCategory;
 import org.keycloak.quarkus.runtime.storage.database.Database;
 
 import java.util.Optional;
@@ -129,8 +130,8 @@ final class DatabasePropertyMappers {
         };
     }
 
-    private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.DATABASE);
+    private static <T> PropertyMapper.Builder<T> builder() {
+        return PropertyMapper.builder(OptionCategory.DATABASE);
     }
 
     private static String resolveUsername(String value, ConfigSourceInterceptorContext context) {
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java
index bed711e0664..0b47184e9ed 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java
@@ -3,6 +3,7 @@ package org.keycloak.quarkus.runtime.configuration.mappers;
 import java.util.ArrayList;
 import java.util.List;
 import org.keycloak.common.Profile;
+import org.keycloak.config.OptionCategory;
 
 final class FeaturePropertyMappers {
 
@@ -39,6 +40,6 @@ final class FeaturePropertyMappers {
     }
 
     private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.FEATURE).isBuildTimeProperty(true);
+        return PropertyMapper.builder(OptionCategory.FEATURE).isBuildTimeProperty(true);
     }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java
index 5750bd471cc..8f1ef351c71 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java
@@ -1,5 +1,7 @@
 package org.keycloak.quarkus.runtime.configuration.mappers;
 
+import org.keycloak.config.OptionCategory;
+
 import java.util.Arrays;
 
 
@@ -21,6 +23,6 @@ final class HealthPropertyMappers {
     }
 
     private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.HEALTH);
+        return PropertyMapper.builder(OptionCategory.HEALTH);
     }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnamePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnamePropertyMappers.java
index ca33ab4ed76..b5c76d0e033 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnamePropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnamePropertyMappers.java
@@ -1,6 +1,8 @@
 package org.keycloak.quarkus.runtime.configuration.mappers;
 
 
+import org.keycloak.config.OptionCategory;
+
 final class HostnamePropertyMappers {
 
     private HostnamePropertyMappers(){}
@@ -45,6 +47,6 @@ final class HostnamePropertyMappers {
     }
 
     private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.HOSTNAME);
+        return PropertyMapper.builder(OptionCategory.HOSTNAME);
     }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java
index 36a0a220f79..ac04228d9d8 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java
@@ -2,6 +2,9 @@ package org.keycloak.quarkus.runtime.configuration.mappers;
 
 import io.smallrye.config.ConfigSourceInterceptorContext;
 import io.smallrye.config.ConfigValue;
+import org.keycloak.config.HttpOptions;
+import org.keycloak.config.Option;
+import org.keycloak.config.OptionCategory;
 import org.keycloak.quarkus.runtime.Environment;
 import org.keycloak.quarkus.runtime.Messages;
 import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider;
@@ -10,6 +13,7 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.Arrays;
 
+import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption;
 import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.getMapper;
 import static org.keycloak.quarkus.runtime.integration.QuarkusPlatform.addInitializationException;
 
@@ -40,10 +44,8 @@ final class HttpPropertyMappers {
                         .paramLabel("path")
                         .isBuildTimeProperty(true)
                         .build(),
-                builder().from("http-port")
+                fromOption(HttpOptions.httpPort)
                         .to("quarkus.http.port")
-                        .defaultValue(String.valueOf(8080))
-                        .description("The used HTTP port.")
                         .paramLabel("port")
                         .build(),
                 builder().from("https-port")
@@ -159,8 +161,6 @@ final class HttpPropertyMappers {
         return null;
     }
 
-    private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.HTTP);
-    }
+    private static <T> PropertyMapper.Builder<T> builder() { return PropertyMapper.<T> builder(OptionCategory.HTTP); }
 }
 
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java
index 94e1911905d..5a1a653d7b1 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java
@@ -9,6 +9,7 @@ import java.util.function.BiFunction;
 import java.util.logging.Level;
 
 import org.jboss.logmanager.LogContext;
+import org.keycloak.config.OptionCategory;
 import org.keycloak.quarkus.runtime.Messages;
 
 import io.smallrye.config.ConfigSourceInterceptorContext;
@@ -175,7 +176,7 @@ public final class LoggingPropertyMappers {
         LogContext.getLogContext().getLogger(category).setLevel(toLevel(level));
     }
 
-    private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.LOGGING);
+    private static <T> PropertyMapper.Builder<T> builder() {
+        return PropertyMapper.builder(OptionCategory.LOGGING);
     }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java
index aa79e0917f8..5c51402573d 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java
@@ -1,5 +1,7 @@
 package org.keycloak.quarkus.runtime.configuration.mappers;
 
+import org.keycloak.config.OptionCategory;
+
 import java.util.Arrays;
 
 
@@ -21,6 +23,6 @@ final class MetricsPropertyMappers {
     }
 
     private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.METRICS);
+        return PropertyMapper.builder(OptionCategory.METRICS);
     }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java
index 4e648864ec6..606af17fd72 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java
@@ -21,18 +21,27 @@ import static org.keycloak.quarkus.runtime.configuration.Configuration.OPTION_PA
 import static org.keycloak.quarkus.runtime.configuration.Configuration.toCliFormat;
 import static org.keycloak.quarkus.runtime.configuration.Configuration.toEnvVarFormat;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.stream.Collectors;
 
 import io.smallrye.config.ConfigSourceInterceptorContext;
 import io.smallrye.config.ConfigValue;
 
+import org.keycloak.config.Option;
+import org.keycloak.config.OptionBuilder;
+import org.keycloak.config.OptionCategory;
 import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider;
 
-public class PropertyMapper {
+public class PropertyMapper<T> {
 
-    static PropertyMapper IDENTITY = new PropertyMapper(null, null, null, null, null,
+    static PropertyMapper IDENTITY = new PropertyMapper(String.class, null, null, Optional.empty(), null, null,
             false,null, null, false,Collections.emptyList(),null, true) {
         @Override
         public ConfigValue getConfigValue(String name, ConfigSourceInterceptorContext context) {
@@ -40,45 +49,47 @@ public class PropertyMapper {
         }
     };
 
+    private final Option<T> option;
     private final String to;
-    private final String from;
-    private final String defaultValue;
     private final BiFunction<String, ConfigSourceInterceptorContext, String> mapper;
     private final String mapFrom;
-    private final boolean buildTime;
-    private final String description;
     private final boolean mask;
-    private final Iterable<String> expectedValues;
-    private final ConfigCategory category;
+    private final List<T> expectedValues;
     private final String paramLabel;
-    private final boolean hidden;
     private final String envVarFormat;
     private String cliFormat;
 
-    PropertyMapper(String from, String to, String defaultValue, BiFunction<String, ConfigSourceInterceptorContext, String> mapper,
-            String mapFrom, boolean buildTime, String description, String paramLabel, boolean mask, Iterable<String> expectedValues,
-            ConfigCategory category, boolean hidden) {
-        this.from = MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX + from;
-        this.to = to == null ? this.from : to;
-        this.defaultValue = defaultValue;
+    // Backward compatible constructor
+    PropertyMapper(Class<T> type, String from, String to, Optional<T> defaultValue, BiFunction<String, ConfigSourceInterceptorContext, String> mapper,
+            String mapFrom, boolean buildTime, String description, String paramLabel, boolean mask, List<T> expectedValues,
+            OptionCategory category, boolean hidden) {
+        Set<Option.Runtime> runtimes = new HashSet<>();
+        if (!hidden) {
+            runtimes.add(Option.Runtime.QUARKUS);
+        }
+        this.option = new OptionBuilder<T>(MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX + from, type)
+                .buildTime(buildTime)
+                .category(category != null ? category : OptionCategory.GENERAL)
+                .defaultValue(defaultValue)
+                .description(description)
+                .expectedValues(expectedValues)
+                .runtimes(runtimes)
+                .build();
+        this.to = to == null ? option.getKey() : to;
         this.mapper = mapper == null ? PropertyMapper::defaultTransformer : mapper;
         this.mapFrom = mapFrom;
-        this.buildTime = buildTime;
-        this.description = description;
         this.paramLabel = paramLabel;
         this.mask = mask;
         this.expectedValues = expectedValues == null ? Collections.emptyList() : expectedValues;
-        this.category = category != null ? category : ConfigCategory.GENERAL;
-        this.hidden = hidden;
         this.cliFormat = toCliFormat(from);
-        this.envVarFormat = toEnvVarFormat(this.from);
+        this.envVarFormat = toEnvVarFormat(option.getKey());
     }
 
     public static PropertyMapper.Builder builder(String fromProp, String toProp) {
         return new PropertyMapper.Builder(fromProp, toProp);
     }
 
-    public static PropertyMapper.Builder builder(ConfigCategory category) {
+    public static PropertyMapper.Builder builder(OptionCategory category) {
         return new PropertyMapper.Builder(category);
     }
 
@@ -91,7 +102,7 @@ public class PropertyMapper {
     }
 
     ConfigValue getConfigValue(String name, ConfigSourceInterceptorContext context) {
-        String from = this.from;
+        String from = this.option.getKey();
 
         if (to != null && to.endsWith(OPTION_PART_SEPARATOR)) {
             // in case mapping is based on prefixes instead of full property names
@@ -111,8 +122,8 @@ public class PropertyMapper {
                     // parent value not explicitly set, try to resolve the default value set to the parent property
                     PropertyMapper parentMapper = PropertyMappers.getMapper(parentKey);
 
-                    if (parentMapper != null) {
-                        parentValue = ConfigValue.builder().withValue(parentMapper.getDefaultValue()).build();
+                    if (parentMapper != null && parentMapper.getDefaultValue().isPresent()) {
+                        parentValue = ConfigValue.builder().withValue(parentMapper.getDefaultValue().get().toString()).build();
                     }
                 }
 
@@ -121,8 +132,8 @@ public class PropertyMapper {
                 }
             }
 
-            if (defaultValue != null) {
-                return transformValue(defaultValue, context);
+            if (this.option.getDefaultValue().isPresent()) {
+                return transformValue(this.option.getDefaultValue().get().toString(), context);
             }
 
             // now tries any defaults from quarkus
@@ -149,30 +160,30 @@ public class PropertyMapper {
         return value;
     }
 
+    public Class<T> getType() { return this.option.getType(); }
+
     public String getFrom() {
-        return from;
+        return this.option.getKey();
     }
 
-    public String getDescription() {
-        return description;
-    }
+    public String getDescription() { return this.option.getDescription(); }
 
-    public Iterable<String> getExpectedValues() {
+    public List<T> getExpectedValues() {
         return expectedValues;
     }
 
-    public String getDefaultValue() {return defaultValue; }
+    public Optional<T> getDefaultValue() {return this.option.getDefaultValue(); }
 
-    public ConfigCategory getCategory() {
-        return category;
+    public OptionCategory getCategory() {
+        return this.option.getCategory();
     }
 
     public boolean isHidden() {
-        return hidden;
+        return !this.option.getSupportedRuntimes().contains(Option.Runtime.QUARKUS);
     }
 
     public boolean isBuildTime() {
-        return buildTime;
+        return this.option.isBuildTime();
     }
 
     public String getTo() {
@@ -213,22 +224,23 @@ public class PropertyMapper {
         return null;
     }
 
-    public static class Builder {
+    public static class Builder<T> {
 
+        private Class<T> type;
         private String from;
         private String to;
-        private String defaultValue;
+        private T defaultValue;
         private BiFunction<String, ConfigSourceInterceptorContext, String> mapper;
         private String description;
         private String mapFrom = null;
-        private Iterable<String> expectedValues = Collections.emptyList();
+        private List<T> expectedValues = new ArrayList<>();
         private boolean isBuildTimeProperty = false;
         private boolean isMasked = false;
-        private ConfigCategory category = ConfigCategory.GENERAL;
+        private OptionCategory category = OptionCategory.GENERAL;
         private String paramLabel;
         private boolean hidden;
 
-        public Builder(ConfigCategory category) {
+        public Builder(OptionCategory category) {
             this.category = category;
         }
 
@@ -237,84 +249,99 @@ public class PropertyMapper {
             this.to = toProp;
         }
 
-        public Builder from(String from) {
+        public Builder<T> from(String from) {
             this.from = from;
             return this;
         }
 
-        public Builder to(String to) {
+        public Builder<T> to(String to) {
             this.to = to;
             return this;
         }
 
 
-        public Builder defaultValue(String defaultValue) {
+        public Builder<T> defaultValue(T defaultValue) {
             this.defaultValue = defaultValue;
             return this;
         }
 
-        public Builder transformer(BiFunction<String, ConfigSourceInterceptorContext, String> mapper) {
+        public Builder<T> transformer(BiFunction<String, ConfigSourceInterceptorContext, String> mapper) {
             this.mapper = mapper;
             return this;
         }
 
-        public Builder description(String description) {
+        public Builder<T> description(String description) {
             this.description = description;
             return this;
         }
 
-        public Builder paramLabel(String label) {
+        public Builder<T> paramLabel(String label) {
             this.paramLabel = label;
             return this;
         }
 
-        public Builder mapFrom(String mapFrom) {
+        public Builder<T> mapFrom(String mapFrom) {
             this.mapFrom = mapFrom;
             return this;
         }
 
-        public Builder expectedValues(Iterable<String> expectedValues) {
-            this.expectedValues = expectedValues;
+        public Builder<T> expectedValues(List<T> expectedValues) {
+            this.expectedValues = new ArrayList<>(expectedValues);
             return this;
         }
 
-        public Builder expectedValues(String... expectedValues) {
-            this.expectedValues = Arrays.asList(expectedValues);
+        public Builder expectedValues(T... expectedValues) {
+            this.expectedValues = new ArrayList<>(Arrays.asList(expectedValues));
             return this;
         }
 
-        public Builder isBuildTimeProperty(boolean isBuildTime) {
+        public Builder<T> isBuildTimeProperty(boolean isBuildTime) {
             this.isBuildTimeProperty = isBuildTime;
             return this;
         }
 
-        public Builder isMasked(boolean isMasked) {
+        public Builder<T> isMasked(boolean isMasked) {
             this.isMasked = isMasked;
             return this;
         }
 
-        public Builder category(ConfigCategory category) {
+        public Builder<T> category(OptionCategory category) {
             this.category = category;
             return this;
         }
 
-        public Builder type(Class<Boolean> type) {
+        public Builder<T> type(Class<T> type) {
             if (Boolean.class.equals(type)) {
-                expectedValues(Boolean.TRUE.toString(), Boolean.FALSE.toString());
-                paramLabel(defaultValue == null ? "true|false" : defaultValue);
-                defaultValue(defaultValue == null ? Boolean.FALSE.toString() : defaultValue);
+                expectedValues((T) Boolean.TRUE.toString(), (T) Boolean.FALSE.toString());
+                paramLabel(defaultValue == null ? "true|false" : defaultValue.toString());
+                defaultValue(defaultValue == null ? (T) Boolean.FALSE : defaultValue);
             }
+            this.type = type;
             return this;
         }
 
-        public Builder hidden(boolean hidden) {
+        public Builder<T> hidden(boolean hidden) {
             this.hidden = hidden;
             return this;
         }
 
-        public PropertyMapper build() {
-            return new PropertyMapper(from, to, defaultValue, mapper, mapFrom, isBuildTimeProperty, description, paramLabel,
+        public PropertyMapper<T> build() {
+            return new PropertyMapper<T>(type, from, to, Optional.ofNullable(defaultValue), mapper, mapFrom, isBuildTimeProperty, description, paramLabel,
                     isMasked, expectedValues, category, hidden);
         }
     }
+
+    public static <T> PropertyMapper.Builder<T> fromOption(Option<T> opt) {
+        Builder<T> builder = PropertyMapper.builder(opt.getCategory())
+                .type(opt.getType())
+                .from(opt.getKey())
+                .hidden(!opt.getSupportedRuntimes().contains(Option.Runtime.QUARKUS))
+                .description(opt.getDescription())
+                .isBuildTimeProperty(opt.isBuildTime())
+                .expectedValues(opt.getExpectedValues());
+        if (opt.getDefaultValue().isPresent()) {
+            builder.defaultValue(opt.getDefaultValue().get());
+        }
+        return builder;
+    }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java
index 387029d4a6b..ec6ea4f36b2 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java
@@ -7,6 +7,7 @@ import java.util.function.BiFunction;
 
 import static org.keycloak.quarkus.runtime.integration.QuarkusPlatform.addInitializationException;
 
+import org.keycloak.config.OptionCategory;
 import org.keycloak.quarkus.runtime.Messages;
 
 final class ProxyPropertyMappers {
@@ -25,13 +26,13 @@ final class ProxyPropertyMappers {
                         .description("The proxy address forwarding mode if the server is behind a reverse proxy. " +
                                 "Possible values are: " + String.join(",",possibleProxyValues))
                         .paramLabel("mode")
-                        .category(ConfigCategory.PROXY)
+                        .category(OptionCategory.PROXY)
                         .build(),
                 builder().to("quarkus.http.proxy.enable-forwarded-host")
                         .mapFrom("proxy")
                         .defaultValue("false")
                         .transformer(ProxyPropertyMappers::resolveEnableForwardedHost)
-                        .category(ConfigCategory.PROXY)
+                        .category(OptionCategory.PROXY)
                         .build()
         };
     }
@@ -56,7 +57,7 @@ final class ProxyPropertyMappers {
         return String.valueOf(!"none".equals(proxy));
     }
 
-    private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.PROXY);
+    private static <T> PropertyMapper.Builder<T> builder() {
+        return PropertyMapper.builder(OptionCategory.PROXY);
     }
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java
index f3715ecfbfe..c85a2cc04a6 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java
@@ -1,6 +1,7 @@
 package org.keycloak.quarkus.runtime.configuration.mappers;
 
 import io.smallrye.config.ConfigSourceInterceptorContext;
+import org.keycloak.config.OptionCategory;
 
 import java.util.Arrays;
 
@@ -32,8 +33,8 @@ public class TransactionPropertyMappers {
         return "enabled";
     }
 
-    private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.TRANSACTION);
+    private static <T> PropertyMapper.Builder<T> builder() {
+        return PropertyMapper.builder(OptionCategory.TRANSACTION);
     }
 
 }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java
index 6b7c853cbff..bf16eeaff4c 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java
@@ -1,5 +1,7 @@
 package org.keycloak.quarkus.runtime.configuration.mappers;
 
+import org.keycloak.config.OptionCategory;
+
 final class VaultPropertyMappers {
 
     private VaultPropertyMappers() {
@@ -46,6 +48,6 @@ final class VaultPropertyMappers {
     }
 
     private static PropertyMapper.Builder builder() {
-        return PropertyMapper.builder(ConfigCategory.VAULT);
+        return PropertyMapper.builder(OptionCategory.VAULT);
     }
 }