diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96c54df0..b44e7555 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,11 +29,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set default python version
-        run: sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2
+        run: sudo update-alternatives --install /usr/bin/python python ${pythonLocation}/bin/python3.8 2
+
 
       - name: Install python dependencies
         run: |
-          sudo python3 -m pip install molecule[docker] yamllint ansible ansible-lint docker openwisp-utils[qa]
+          python -m pip install molecule[docker] yamllint ansible ansible-lint docker openwisp-utils[qa]
 
       - name: QA checks
         run: |
diff --git a/tasks/freeradius.yml b/tasks/freeradius.yml
index ce9755c0..afa174ed 100644
--- a/tasks/freeradius.yml
+++ b/tasks/freeradius.yml
@@ -154,7 +154,7 @@
 
 - name: Inner tunnel
   template:
-    src: freeradius/openwisp_site.j2
+    src: freeradius/inner_tunnel.j2
     dest: "{{ freeradius_sites_enabled_dir }}/inner-tunnel"
     mode: 0640
     owner: freerad
diff --git a/templates/freeradius/inner-tunnel.j2 b/templates/freeradius/inner_tunnel.j2
similarity index 98%
rename from templates/freeradius/inner-tunnel.j2
rename to templates/freeradius/inner_tunnel.j2
index 686ca489..9bec6c31 100644
--- a/templates/freeradius/inner-tunnel.j2
+++ b/templates/freeradius/inner_tunnel.j2
@@ -1,4 +1,4 @@
-server inner-tunnel {
+server inner_tunnel {
     listen {
         ipaddr = 127.0.0.1
         port = 18120
diff --git a/templates/freeradius/sql_counter.j2 b/templates/freeradius/sql_counter.j2
index 963b1de6..1ae67cfa 100644
--- a/templates/freeradius/sql_counter.j2
+++ b/templates/freeradius/sql_counter.j2
@@ -2,7 +2,7 @@
 
 sqlcounter dailycounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Daily-Session-Time
     check_name = Max-Daily-Session
@@ -13,11 +13,10 @@ sqlcounter dailycounter {
 
     $INCLUDE ${modconfdir}/sql/counter/${dialect}/${.:instance}.conf
 }
-
 # The dailybandwidthcounter is added by OpenWISP
 sqlcounter dailybandwidthcounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Max-Daily-Session-Traffic
     check_name = Max-Daily-Session-Traffic
@@ -29,7 +28,7 @@ sqlcounter dailybandwidthcounter {
 
 sqlcounter noresetcounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Max-All-Session-Time
     check_name = Max-All-Session
@@ -41,7 +40,7 @@ sqlcounter noresetcounter {
 
 sqlcounter monthlycounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Monthly-Session-Time
     check_name = Max-Monthly-Session
@@ -54,7 +53,7 @@ sqlcounter monthlycounter {
 
 sqlcounter expire_on_login {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Expire-After-Initial-Login
     check_name = Expire-After