diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2f232b0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+**/web_cache.json
+**/tmp/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a8a70aa
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ovos-docker-upstream"]
+	path = ovos-docker-upstream
+	url = https://github.com/OpenVoiceOS/ovos-docker
diff --git a/mycroft.conf b/c12s/mycroft.conf
similarity index 100%
rename from mycroft.conf
rename to c12s/mycroft.conf
diff --git a/mycroft.conf.sample b/c12s/mycroft.conf.sample
similarity index 100%
rename from mycroft.conf.sample
rename to c12s/mycroft.conf.sample
diff --git a/ovos_requirements.txt b/c12s/ovos_requirements.txt
similarity index 100%
rename from ovos_requirements.txt
rename to c12s/ovos_requirements.txt
diff --git a/ovos-docker-upstream b/ovos-docker-upstream
new file mode 160000
index 0000000..44cb90f
--- /dev/null
+++ b/ovos-docker-upstream
@@ -0,0 +1 @@
+Subproject commit 44cb90fd51973abbf7824e3d380702872852b812
diff --git a/ovos/config/apps/common_query.openvoiceos/settings.json b/ovos/config/apps/common_query.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/apps/common_query.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/apps/ovos.common_play/settings.json b/ovos/config/apps/ovos.common_play/settings.json
new file mode 100644
index 0000000..e3f12a2
--- /dev/null
+++ b/ovos/config/apps/ovos.common_play/settings.json
@@ -0,0 +1,14 @@
+{
+    "__mycroft_skill_firstrun": false,
+    "type": "ovos_common_play",
+    "preferred_audio_services": [
+        "mpv",
+        "vlc",
+        "simple"
+    ],
+    "disable_mpris": true,
+    "dbus_type": "session",
+    "manage_external_players": false,
+    "active": true,
+    "mode": "auto"
+}
\ No newline at end of file
diff --git a/ovos/config/apps/persona.openvoiceos/settings.json b/ovos/config/apps/persona.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/apps/persona.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/asoundrc b/ovos/config/asoundrc
new file mode 100644
index 0000000..7e2b32f
--- /dev/null
+++ b/ovos/config/asoundrc
@@ -0,0 +1,2 @@
+pcm.!default pipewire
+ctl.!default pipewire
diff --git a/ovos/config/mycroft.conf b/ovos/config/mycroft.conf
new file mode 100644
index 0000000..b88b7d0
--- /dev/null
+++ b/ovos/config/mycroft.conf
@@ -0,0 +1,57 @@
+{
+  "log_level": "INFO",
+  "logs": {
+    "path": "stdout"
+  },
+  "play_wav_cmdline": "play %1",
+  "play_mp3_cmdline": "play %1",
+  "lang": "en-US",
+  "listener": {
+    "VAD": {
+      "module": "ovos-vad-plugin-silero"
+    }
+  },
+  "skills": {
+    "installer": {
+      "allow_pip": true,
+      "allow_alphas": true
+    }
+  },
+  "gui": {
+    "extension": "ovos-gui-plugin-shell-companion",
+    "gui_file_host_path": "/home/ovos/.cache/gui_files"
+  },
+  "websocket": {
+    "max_msg_size": 100
+  },
+  "PHAL": {
+    "admin": {
+      "ovos-PHAL-plugin-system": {
+        "enabled": true
+      }
+    }
+  },
+  "open_data": {
+    "intent_urls": [
+      "https://metrics.tigregotico.pt/intents"
+    ]
+  },
+  "tts": {
+    "ovos-tts-plugin-server": {
+      "voice": "ryan-low"
+    },
+    "module": "ovos-tts-plugin-server"
+  },
+  "stt": {
+    "ovos-stt-plugin-server": {},
+    "module": "ovos-stt-plugin-server",
+    "fallback_module": ""
+  },
+  "system_unit": "imperial",
+  "temperature_unit": "fahrenheit",
+  "precipitation_unit": "inch",
+  "windspeed_unit": "mph",
+  "time_format": "half",
+  "spoken_time_format": "half",
+  "date_format": "MDY"
+}
\ No newline at end of file
diff --git a/ovos/config/phal/ovos-PHAL-plugin-alsa.json b/ovos/config/phal/ovos-PHAL-plugin-alsa.json
new file mode 100644
index 0000000..0d9714d
--- /dev/null
+++ b/ovos/config/phal/ovos-PHAL-plugin-alsa.json
@@ -0,0 +1,3 @@
+{
+    "first_boot": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/ovos-skill-alerts.openvoiceos/settings.json b/ovos/config/skills/ovos-skill-alerts.openvoiceos/settings.json
new file mode 100644
index 0000000..ce22915
--- /dev/null
+++ b/ovos/config/skills/ovos-skill-alerts.openvoiceos/settings.json
@@ -0,0 +1,15 @@
+{
+    "speak_alarm": false,
+    "speak_timer": true,
+    "sound_alarm": "constant_beep.mp3",
+    "sound_timer": "beep4.mp3",
+    "snooze_mins": 15,
+    "timeout_min": 1,
+    "play_volume": 90,
+    "escalate_volume": true,
+    "priority_cutoff": 8,
+    "services": "",
+    "frequency": 15,
+    "sync_ask": false,
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/ovos-skill-ggwave.openvoiceos/settings.json b/ovos/config/skills/ovos-skill-ggwave.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/ovos-skill-ggwave.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/ovos-skill-personal.OpenVoiceOS/settings.json b/ovos/config/skills/ovos-skill-personal.OpenVoiceOS/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/ovos-skill-personal.OpenVoiceOS/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-boot-finished.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-boot-finished.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-boot-finished.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-date-time.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-date-time.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-date-time.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-ddg.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-ddg.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-ddg.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-fallback-unknown.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-fallback-unknown.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-fallback-unknown.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-hello-world.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-hello-world.openvoiceos/settings.json
new file mode 100644
index 0000000..f02e1d7
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-hello-world.openvoiceos/settings.json
@@ -0,0 +1,4 @@
+{
+    "log_level": "WARNING",
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-homescreen.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-homescreen.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-homescreen.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-volume.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-volume.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-volume.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-weather.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-weather.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-weather.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file
diff --git a/ovos/config/skills/skill-ovos-wikipedia.openvoiceos/settings.json b/ovos/config/skills/skill-ovos-wikipedia.openvoiceos/settings.json
new file mode 100644
index 0000000..cf0da00
--- /dev/null
+++ b/ovos/config/skills/skill-ovos-wikipedia.openvoiceos/settings.json
@@ -0,0 +1,3 @@
+{
+    "__mycroft_skill_firstrun": false
+}
\ No newline at end of file