diff --git a/src/exits/zif_abapgit_exit.intf.abap b/src/exits/zif_abapgit_exit.intf.abap
index 5a95ec67b..e07b0b21f 100644
--- a/src/exits/zif_abapgit_exit.intf.abap
+++ b/src/exits/zif_abapgit_exit.intf.abap
@@ -7,7 +7,7 @@ INTERFACE zif_abapgit_exit PUBLIC.
       clone_url TYPE string,
     END OF ty_ci_repo.
   TYPES:
-    ty_ci_repos TYPE TABLE OF ty_ci_repo.
+    ty_ci_repos TYPE STANDARD TABLE OF ty_ci_repo WITH DEFAULT KEY.
   TYPES:
     ty_object_types TYPE STANDARD TABLE OF tadir-object WITH DEFAULT KEY.
   TYPES:
diff --git a/src/objects/aff/zcl_abapgit_json_handler.clas.abap b/src/objects/aff/zcl_abapgit_json_handler.clas.abap
index 738d017f9..877dde787 100644
--- a/src/objects/aff/zcl_abapgit_json_handler.clas.abap
+++ b/src/objects/aff/zcl_abapgit_json_handler.clas.abap
@@ -18,7 +18,7 @@ CLASS zcl_abapgit_json_handler DEFINITION
         mappings TYPE ty_json_abap_mappings,
       END OF ty_enum_mapping .
     TYPES:
-      ty_enum_mappings TYPE TABLE OF ty_enum_mapping WITH DEFAULT KEY .
+      ty_enum_mappings TYPE STANDARD TABLE OF ty_enum_mapping WITH DEFAULT KEY .
     TYPES:
       BEGIN OF ty_path_value_pair,
         path  TYPE string,
diff --git a/src/objects/zcl_abapgit_object_sush.clas.abap b/src/objects/zcl_abapgit_object_sush.clas.abap
index d9e0cc92d..974a94250 100644
--- a/src/objects/zcl_abapgit_object_sush.clas.abap
+++ b/src/objects/zcl_abapgit_object_sush.clas.abap
@@ -23,10 +23,10 @@ CLASS zcl_abapgit_object_sush DEFINITION
     METHODS clear_metadata
       CHANGING
         cs_data_head TYPE any
-        ct_usobx     TYPE table
-        ct_usobt     TYPE table
-        ct_usobx_ext TYPE table
-        ct_usobt_ext TYPE table.
+        ct_usobx     TYPE STANDARD TABLE
+        ct_usobt     TYPE STANDARD TABLE
+        ct_usobx_ext TYPE STANDARD TABLE
+        ct_usobt_ext TYPE STANDARD TABLE.
 
 ENDCLASS.
 
diff --git a/src/ui/zif_abapgit_popups.intf.abap b/src/ui/zif_abapgit_popups.intf.abap
index d6217dbcb..d921b749e 100644
--- a/src/ui/zif_abapgit_popups.intf.abap
+++ b/src/ui/zif_abapgit_popups.intf.abap
@@ -12,7 +12,7 @@ INTERFACE zif_abapgit_popups
       show_icon TYPE abap_bool,
       center    TYPE abap_bool,
     END OF ty_alv_column,
-    ty_alv_column_tt TYPE TABLE OF ty_alv_column WITH DEFAULT KEY.
+    ty_alv_column_tt TYPE STANDARD TABLE OF ty_alv_column WITH DEFAULT KEY.
 
   TYPES:
     BEGIN OF ty_popup_position,