diff --git a/pom.xml b/pom.xml
index c9bdd1c0cac2574704922de589df059f04492dab..c2de33bbcc67c0a775be229ab14947cb512534ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,14 @@
 		</dependency>
 
 		<!-- Spring -->
+		<dependency>
+			<groupId>net.devh</groupId>
+			<artifactId>grpc-client-spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-inprocess</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
diff --git a/src/main/java/de/ozgcloud/admin/GrpcConfiguration.java b/src/main/java/de/ozgcloud/admin/GrpcConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..81537a802b20132a52f2ee820948b91a91e4dbb7
--- /dev/null
+++ b/src/main/java/de/ozgcloud/admin/GrpcConfiguration.java
@@ -0,0 +1,22 @@
+package de.ozgcloud.admin;
+
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * A workaround for @GrpcClient to work i.e. inject dependency until full Spring 3 support is available.
+ * https://github.com/yidongnan/grpc-spring-boot-starter/pull/775
+ */
+@Configuration
+@ImportAutoConfiguration({
+		net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration.class,
+		net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration.class,
+		net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration.class,
+		net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration.class,
+		net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration.class,
+		net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration.class,
+		net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration.class,
+		net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration.class
+})
+public class GrpcConfiguration {
+}