diff --git a/tasks/install.yml b/tasks/install.yml
index 8f7694d60b7af0edf373242b4799c63a577a1e75..6cacc8995d0e9eebbcbd1a89ef5ab77e0a1b8773 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -51,7 +51,7 @@
 - name: "Clone Git Repository"
   git:
     accept_hostkey: yes
-    repo: 'git@github.com:matomo/matomo.git'
+    repo: 'git@github.com:matomo-org/matomo.git'
     dest: '{{ webRoot }}'
     track_submodules: yes
     force: yes
diff --git a/templates/config.ini.php b/templates/config.ini.php
index 0e61329c7a04cb7bf69af7558247cf99f416c79f..36f284543c65a6898b3a812e8373a814cc498b5f 100644
--- a/templates/config.ini.php
+++ b/templates/config.ini.php
@@ -5,7 +5,7 @@ host = "127.0.0.1"
 username = "root"
 password = "{{ mysql_root_password|default("root") }}"
 dbname = "matomo_{{ matomo.id }}"
-tables_prefix = "matomo_"
+tables_prefix = "{{ matomo.tables_prefix|default("matomo") }}_"
 port = "{{ matomo.db_port|default('3306') }}"
 
 [General]