diff --git a/diagnostic/consts.go b/diagnostic/consts.go
index b2da5304..7b48b3d6 100644
--- a/diagnostic/consts.go
+++ b/diagnostic/consts.go
@@ -31,4 +31,6 @@ const (
 	networkBaseName           = "network.json"
 	rawNetworkBaseName        = "raw-network.txt"
 	tunnelStateBaseName       = "tunnelstate.json"
+	cliConfigurationBaseName  = "cli-configuration.json"
+	configurationBaseName     = "configuration.json"
 )
diff --git a/diagnostic/diagnostic.go b/diagnostic/diagnostic.go
index a4c182b5..876a964e 100644
--- a/diagnostic/diagnostic.go
+++ b/diagnostic/diagnostic.go
@@ -376,6 +376,16 @@ func createJobs(
 			fn:      jsonNetworkCollectorFunc,
 			bypass:  noDiagNetwork,
 		},
+		{
+			jobName: "cli configuration",
+			fn:      collectFromEndpointAdapter(client.GetCliConfiguration, cliConfigurationBaseName),
+			bypass:  false,
+		},
+		{
+			jobName: "configuration",
+			fn:      collectFromEndpointAdapter(client.GetTunnelConfiguration, configurationBaseName),
+			bypass:  false,
+		},
 	}
 
 	return jobs