diff --git a/Dockerfile b/Dockerfile
index ee016b3..39b8bab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ ARG ARCH=armv7hf
 ARG REPO=axisecp
 ARG VERSION=1.14
 ARG UBUNTU_VERSION=22.04
+ARG GRPC_VERSION=v1.65.5
 
 FROM arm64v8/ubuntu:${UBUNTU_VERSION} AS containerized_aarch64
 FROM arm32v7/ubuntu:${UBUNTU_VERSION} AS containerized_armv7hf
@@ -46,6 +47,7 @@ FROM build_base AS testdata
 
 # Install Edge TPU compiler
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# hadolint ignore=DL3009
 RUN <<EOF
 echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" \
     | tee /etc/apt/sources.list.d/coral-edgetpu.list
@@ -95,6 +97,7 @@ FROM build_base AS build_grpc
 
 ARG ARCH
 ARG TARGETSYSROOT=/opt/axis/acapsdk/sysroots/${ARCH}
+ARG GRPC_VERSION
 
 # Switch to build directory
 WORKDIR /opt
@@ -103,7 +106,7 @@ WORKDIR /opt
 # We do this because we need to be able to run protoc and grpc_cpp_plugin
 # while cross-compiling.
 RUN <<EOF
-    git clone -b v1.46.3 https://github.com/grpc/grpc
+    git clone -b ${GRPC_VERSION} https://github.com/grpc/grpc
     cd grpc
     git submodule update --init
 EOF
@@ -134,24 +137,6 @@ ARG TARGETSYSROOT=/opt/axis/acapsdk/sysroots/${ARCH}
 
 # return to build dir
 WORKDIR /opt
-# Build for ARM
-
-# Clone openssl and extract source code
-RUN <<EOF
-    if [ "$ARCH" = "armv7hf" ]; then
-        export CC_SETTING="arm-linux-gnueabihf-gcc";
-    elif [ "$ARCH" = "aarch64" ]; then
-        export CC_SETTING="aarch64-linux-gnu-gcc";
-    fi;
-    curl -O https://www.openssl.org/source/openssl-1.1.1l.tar.gz
-    tar xzvf openssl-1.1.1l.tar.gz
-    mkdir -p openssl-1.1.1l/build
-    cd openssl-1.1.1l/build
-    rm -rf ../doc
-    ../Configure linux-armv4 no-asm --prefix=$TARGETSYSROOT/usr
-    make CC="$CC_SETTING"
-    make install
-EOF
 
 # Build and install gRPC for ARM.
 # This build will use the host architecture copies of protoc and
@@ -164,10 +149,12 @@ RUN <<EOF
     CXXFLAGS="$CXXFLAGS -g0" cmake \
         -DCMAKE_SYSTEM_NAME=Linux \
         -DCMAKE_SYSTEM_PROCESSOR="$SYSTEM_PROCESSOR_ARCH" \
+        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
+        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+        -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
         -DCMAKE_INSTALL_PREFIX="$SDKTARGETSYSROOT"/usr \
         -DCMAKE_FIND_ROOT_PATH="$SDKTARGETSYSROOT"/usr \
-        -DgRPC_INSTALL=ON \
-        -DgRPC_SSL_PROVIDER=package \
         -DCMAKE_BUILD_TYPE=Release \
         ../..
     make -j4 install/strip
@@ -177,6 +164,8 @@ EOF
 
 FROM build_grpc_arm AS build
 
+ARG ARCH
+ARG TARGETSYSROOT=/opt/axis/acapsdk/sysroots/${ARCH}
 ARG TEST
 ARG DEBUG
 
@@ -198,7 +187,6 @@ EOF
 RUN patch /opt/app/apis/tensorflow_serving/apis/predict.proto /opt/app/apis/predict_additions.patch
 
 # Building the ACAP application
-
 # hadolint ignore=SC2046,SC2155
 RUN <<EOF
     export MANIFEST="manifest-$ARCH.json";
diff --git a/Makefile b/Makefile
index 4d3fa6e..cf15eaa 100644
--- a/Makefile
+++ b/Makefile
@@ -25,21 +25,55 @@ SRC_FILES := $(wildcard $(SRC_PATH)/*.cpp $(SRC_PATH)/*.cc)
 TEST_FILES := $(wildcard $(TEST_PATH)/*.cpp $(TEST_PATH)/*.cc)
 
 # Compiler flags
-# gRPC and protobuf packages don't play well with pkg-config for include so we do a little workaround
-
-PKGS = protobuf grpc grpc++
-PKG_CONFIG_CFLAGS_I := $(shell PKG_CONFIG_SYSROOT_DIR="" PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags-only-I $(PKGS))
-PKG_CONFIG_CFLAGS_OTHER := $(shell PKG_CONFIG_SYSROOT_DIR="" PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags-only-other $(PKGS))
-PKG_CONFIG_LDFLAGS := $(shell PKG_CONFIG_SYSROOT_DIR="" PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-L $(PKGS))
-PKG_CONFIG_LDLIBS := $(shell PKG_CONFIG_SYSROOT_DIR="" PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-l $(PKGS))
+# grpc and protobuf (and deps) don't play nice with pkg-config so we tediously list (in order) everything needed
+PROTO_PKG_CONFIG_CFLAGS_I := -I$(TARGETSYSROOT)/usr/include
+PROTO_PKG_CONFIG_CFLAGS_OTHER := -DCARES_STATICLIB -pthread -DNOMINMAX
+# Derived from grpc cross-compile example
+PROTO_PKG_CONFIG_LDLIBS := -lgrpc++ -lprotobuf -lgrpc -lupb_json_lib -lupb_textformat_lib \
+                        -lutf8_range -lupb_message_lib -lupb_base_lib -lupb_mem_lib -lre2 \
+                        -lz -lcares -lgpr -labsl_random_distributions -labsl_random_seed_sequences \
+                        -labsl_random_internal_pool_urbg -labsl_random_internal_randen \
+                        -labsl_random_internal_randen_hwaes -labsl_random_internal_randen_hwaes_impl \
+                        -labsl_random_internal_randen_slow -labsl_random_internal_platform \
+                        -labsl_random_internal_seed_material -labsl_random_seed_gen_exception \
+                        -lrt -laddress_sorting -labsl_log_internal_check_op -labsl_leak_check \
+                        -labsl_die_if_null -labsl_log_internal_conditions -labsl_log_internal_message \
+                        -labsl_log_internal_nullguard -labsl_examine_stack -labsl_log_internal_format \
+                        -labsl_log_internal_proto -labsl_log_internal_log_sink_set -labsl_log_sink \
+                        -labsl_log_entry -labsl_log_initialize -labsl_log_internal_globals \
+                        -labsl_log_globals -labsl_vlog_config_internal -labsl_log_internal_fnmatch \
+                        -labsl_statusor -labsl_status -labsl_strerror -lutf8_validity \
+                        -labsl_flags_internal -labsl_flags_marshalling -labsl_flags_reflection \
+                        -labsl_flags_config -labsl_cord -labsl_cordz_info -labsl_cord_internal \
+                        -labsl_cordz_functions -labsl_cordz_handle -labsl_crc_cord_state -labsl_crc32c \
+                        -labsl_str_format_internal -labsl_crc_internal -labsl_crc_cpu_detect \
+                        -labsl_raw_hash_set -labsl_hash -labsl_bad_variant_access -labsl_city \
+                        -labsl_low_level_hash -labsl_hashtablez_sampler -labsl_exponential_biased \
+                        -labsl_flags_private_handle_accessor -labsl_flags_commandlineflag \
+                        -labsl_bad_optional_access -labsl_flags_commandlineflag_internal \
+                        -labsl_flags_program_name -labsl_synchronization -labsl_graphcycles_internal \
+                        -labsl_kernel_timeout_internal -labsl_time -labsl_civil_time -labsl_time_zone \
+                        -labsl_stacktrace -labsl_symbolize -labsl_strings -labsl_strings_internal \
+                        -labsl_string_view -labsl_int128 -labsl_throw_delegate -labsl_malloc_internal \
+                        -labsl_debugging_internal -labsl_demangle_internal -labsl_base \
+                        -labsl_raw_logging_internal -labsl_log_severity -labsl_spinlock_wait
+PROTO_PKG_CONFIG_LDLIBS += $(TARGETSYSROOT)/usr/lib/libabsl_flags_parse.a \
+                        $(TARGETSYSROOT)/usr/lib/libssl.a \
+                        $(TARGETSYSROOT)/usr/lib/libcrypto.a \
+                        -ldl -lm -lsystemd $(TARGETSYSROOT)/usr/lib/libsystemd.so \
+                        $(TARGETSYSROOT)/usr/lib/libabsl_flags_usage.a \
+                        $(TARGETSYSROOT)/usr/lib/libabsl_flags_usage_internal.a
+
+PROTO_CXXFLAGS := $(CXXFLAGS) -std=c++17 $(PROTO_PKG_CONFIG_CFLAGS_OTHER)
 
 PKGS = gio-2.0 glib-2.0 vdostream axparameter
-PKG_CONFIG_CFLAGS_I += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags-only-I $(PKGS))
-PKG_CONFIG_CFLAGS_OTHER += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags-only-other $(PKGS))
-PKG_CONFIG_LDFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-L $(PKGS))
-PKG_CONFIG_LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-l $(PKGS))
-CXXFLAGS += -DLAROD_API_VERSION_2 -std=c++17 -I$(OUT_PATH) $(PKG_CONFIG_CFLAGS_OTHER) $(PKG_CONFIG_CFLAGS_I)
-LDLIBS   += -llarod -lrt $(PKG_CONFIG_LDLIBS)
+PKG_CONFIG_CFLAGS_I := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags-only-I $(PKGS))
+PKG_CONFIG_CFLAGS_OTHER := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags-only-other $(PKGS))
+PKG_CONFIG_LDFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-L $(PKGS))
+PKG_CONFIG_LDLIBS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs-only-l $(PKGS))
+
+CXXFLAGS += -DLAROD_API_VERSION_2 -std=c++17 -I$(OUT_PATH) $(PKG_CONFIG_CFLAGS_OTHER) $(PKG_CONFIG_CFLAGS_I) $(PROTO_PKG_CONFIG_CFLAGS_OTHER) $(PROTO_PKG_CONFIG_CFLAGS_I)
+LDLIBS += -llarod $(PKG_CONFIG_LDLIBS) $(PROTO_PKG_CONFIG_LDLIBS)
 LDFLAGS  += $(PKG_CONFIG_LDFLAGS)
 
 .PHONY: clean install install/strip
@@ -70,18 +104,18 @@ $(OUT_PATH) $(INSTALL_PATH):
 
 # Protobuf object files
 %.pb.o: %.pb.cc
-	$(CXX) -c $(CXXFLAGS) -I$(OUT_PATH) $^ -o $@
+	$(CXX) -c $(PROTO_CXXFLAGS) -I$(OUT_PATH) $^ -o $@
 
 # Generate protobuf gRPC source files
 $(OUT_PATH)/%.grpc.pb.cc $(OUT_PATH)/%grpc.pb.h: $(API_PATH)/%.proto | $(OUT_PATH)
-	protoc $(PKG_CONFIG_CFLAGS_I) \
+	protoc $(PROTO_PKG_CONFIG_CFLAGS_I) \
 	-I$(API_PATH) \
 	--grpc_out=$(OUT_PATH) \
 	--plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
 
 # Generate protobuf source files
 $(OUT_PATH)/%.pb.cc $(OUT_PATH)/%.pb.h: $(API_PATH)/%.proto | $(OUT_PATH)
-	protoc $(PKG_CONFIG_CFLAGS_I) -I$(API_PATH) --cpp_out=$(OUT_PATH) $<
+	protoc $(PROTO_PKG_CONFIG_CFLAGS_I) -I$(API_PATH) --cpp_out=$(OUT_PATH) $<
 
 $(BINARY): $(OUT_PATH)/$(BINARY)
 	cp $(OUT_PATH)/$(BINARY) $(CURDIR)
diff --git a/test/inference_test.cc b/test/inference_test.cc
index 4334e11..0d02f6d 100644
--- a/test/inference_test.cc
+++ b/test/inference_test.cc
@@ -419,7 +419,12 @@ TEST(InferenceTest, ServerAuthentication) {
     string root_cert = read_text(serverCertificatePath);
     SslCredentialsOptions ssl_opts = {root_cert.c_str(), "", ""};
     shared_ptr<ChannelCredentials> creds = grpc::SslCredentials(ssl_opts);
-    shared_ptr<Channel> channel = CreateChannel(target, creds);
+    grpc::ChannelArguments args;
+    // gRPC/ssl doesn't support skipping server common-name verification so we force target name to
+    // localhost as used in the cert creation.
+    args.SetSslTargetNameOverride("localhost");
+    shared_ptr<Channel> channel = grpc::CreateCustomChannel(target, creds, args);
+
     ASSERT_TRUE(channel->WaitForConnected(
         gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(5, GPR_TIMESPAN))));
     unique_ptr<PredictionService::Stub> stub = PredictionService::NewStub(channel);
@@ -566,7 +571,11 @@ TEST(InferenceTest, ServerAuthenticationDlpu) {
     string root_cert = read_text(serverCertificatePath);
     SslCredentialsOptions ssl_opts = {root_cert.c_str(), "", ""};
     shared_ptr<ChannelCredentials> creds = grpc::SslCredentials(ssl_opts);
-    shared_ptr<Channel> channel = CreateChannel(target, creds);
+    grpc::ChannelArguments args;
+    // gRPC/ssl doesn't support skipping server common-name verification so we force target name to
+    // localhost as used in the cert creation.
+    args.SetSslTargetNameOverride("localhost");
+    shared_ptr<Channel> channel = grpc::CreateCustomChannel(target, creds, args);
     ASSERT_TRUE(channel->WaitForConnected(
         gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(5, GPR_TIMESPAN))));
     unique_ptr<PredictionService::Stub> stub = PredictionService::NewStub(channel);
@@ -657,7 +666,11 @@ TEST(InferenceTest, ServerAuthenticationTpu) {
     string root_cert = read_text(serverCertificatePath);
     SslCredentialsOptions ssl_opts = {root_cert.c_str(), "", ""};
     shared_ptr<ChannelCredentials> creds = grpc::SslCredentials(ssl_opts);
-    shared_ptr<Channel> channel = CreateChannel(target, creds);
+    grpc::ChannelArguments args;
+    // gRPC/ssl doesn't support skipping server common-name verification so we force target name to
+    // localhost as used in the cert creation.
+    args.SetSslTargetNameOverride("localhost");
+    shared_ptr<Channel> channel = grpc::CreateCustomChannel(target, creds, args);
     ASSERT_TRUE(channel->WaitForConnected(
         gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(5, GPR_TIMESPAN))));
     unique_ptr<PredictionService::Stub> stub = PredictionService::NewStub(channel);