diff --git a/src/odbc/rsodbc/Release/makefile b/src/odbc/rsodbc/Release/makefile
index 7c25a5cf..36e5bcd8 100644
--- a/src/odbc/rsodbc/Release/makefile
+++ b/src/odbc/rsodbc/Release/makefile
@@ -20,7 +20,7 @@ endif
 
 -include ../makefile.defs
 
-LIBS_PATH := -L../../../pgclient/src/interfaces/libpq/Release -L../../../pgclient/src/port/Release -L../iam/linux/openssl/1.1.1/centos7/gcc5_5/release64/lib  -L../iam/linux/aws-cpp-sdk/1.9.289/centos7/gcc5_5/release64/lib -L ../iam/linux/libcURL/7.78.0_ssl1.1.1_zlib1.2.11_threaded_resolver/centos7/gcc5_5/release64/lib
+LIBS_PATH := -L../../../pgclient/src/interfaces/libpq/Release -L../../../pgclient/src/port/Release
 
 # Add inputs and outputs from these tool invocations to the build variables 
 
diff --git a/src/odbc/rsodbc/Release/objects.mk b/src/odbc/rsodbc/Release/objects.mk
index a5d611eb..265bdc49 100644
--- a/src/odbc/rsodbc/Release/objects.mk
+++ b/src/odbc/rsodbc/Release/objects.mk
@@ -4,12 +4,7 @@
 
 USER_OBJS :=
 
-#LIBS := -lpq -lpgport -lpthread -lssl -lcrypto -lkrb5 -lgssapi_krb5 -lz -ldl -lrt
-LIBS := -lpq -lpgport -lpthread -lkrb5 -lgssapi_krb5 -lz -ldl -lrt
-
-AWS_SDK_LIB_PATH := ../iam/linux/aws-cpp-sdk/1.9.289/centos7/gcc5_5/release64/lib
-LIBCURL_PATH := ../iam/linux/libcURL/7.78.0_ssl1.1.1_zlib1.2.11_threaded_resolver/centos7/gcc5_5/release64/lib
-OPENSSL_LIB_PATH := ../iam/linux/openssl/1.1.1/centos7/gcc5_5/release64/lib
-
-THIRD_PARTY_LIBS := $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-redshift.a $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-redshift-serverless.a $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-sts.a $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-core.a $(AWS_SDK_LIB_PATH)/libaws-crt-cpp.a $(AWS_SDK_LIB_PATH)/libaws-c-s3.a $(AWS_SDK_LIB_PATH)/libaws-c-auth.a $(AWS_SDK_LIB_PATH)/libaws-c-event-stream.a $(AWS_SDK_LIB_PATH)/libaws-c-http.a $(AWS_SDK_LIB_PATH)/libaws-c-mqtt.a $(AWS_SDK_LIB_PATH)/libaws-c-io.a $(AWS_SDK_LIB_PATH)/libaws-c-cal.a $(AWS_SDK_LIB_PATH)/libaws-checksums.a $(AWS_SDK_LIB_PATH)/libaws-c-compression.a $(AWS_SDK_LIB_PATH)/libaws-c-common.a $(AWS_SDK_LIB_PATH)/libs2n.a ../iam/linux/libcURL/7.78.0_ssl1.1.1_zlib1.2.11_threaded_resolver/centos7/gcc5_5/release64/lib/libcurl.a $(OPENSSL_LIB_PATH)/libssl.a $(OPENSSL_LIB_PATH)/libcrypto.a $(AWS_SDK_LIB_PATH)/libaws-c-sdkutils.a
+LIBS := -lpq -lpgport -lpthread -lssl -lcrypto -lkrb5 -lgssapi_krb5 -lz -ldl -lrt -lcurl
 
+AWS_SDK_LIB_PATH := /usr/local/lib64
+THIRD_PARTY_LIBS := $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-redshift.a $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-redshift-serverless.a $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-sts.a $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-core.a $(AWS_SDK_LIB_PATH)/libaws-crt-cpp.a $(AWS_SDK_LIB_PATH)/libaws-c-s3.a $(AWS_SDK_LIB_PATH)/libaws-c-auth.a $(AWS_SDK_LIB_PATH)/libaws-c-event-stream.a $(AWS_SDK_LIB_PATH)/libaws-c-http.a $(AWS_SDK_LIB_PATH)/libaws-c-mqtt.a $(AWS_SDK_LIB_PATH)/libaws-c-io.a $(AWS_SDK_LIB_PATH)/libaws-c-cal.a $(AWS_SDK_LIB_PATH)/libaws-checksums.a $(AWS_SDK_LIB_PATH)/libaws-c-compression.a $(AWS_SDK_LIB_PATH)/libaws-c-common.a $(AWS_SDK_LIB_PATH)/libs2n.a $(AWS_SDK_LIB_PATH)/libaws-c-sdkutils.a
diff --git a/src/odbc/rsodbc/rsodbc_setup/version.h b/src/odbc/rsodbc/rsodbc_setup/version.h
index 77f32397..f92c6a1f 100644
--- a/src/odbc/rsodbc/rsodbc_setup/version.h
+++ b/src/odbc/rsodbc/rsodbc_setup/version.h
@@ -10,7 +10,7 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#define REDSHIFT_DRIVER_VERSION         "2.0.0.1"
+#define REDSHIFT_DRIVER_VERSION         "."
 #define REDSHIFT_VERSION		"08.03.9111"
 #define REDSHIFT_RESOURCE_VERSION	"08.03.9111\0"
 
diff --git a/src/odbc/rsodbc/rsversion.h b/src/odbc/rsodbc/rsversion.h
index d4af492f..6cab6d94 100644
--- a/src/odbc/rsodbc/rsversion.h
+++ b/src/odbc/rsodbc/rsversion.h
@@ -1,5 +1,5 @@
-#define ODBC_DRIVER_VERSION "02.00.0000"
-#define FILEVER        2,0,0,1
-#define PRODUCTVER     2,0,0,1
-#define STRFILEVER     "2, 0, 0, 1\0"
-#define STRPRODUCTVER  "2, 0, 0, 1"
+#define ODBC_DRIVER_VERSION "00.00.0000"
+#define FILEVER        ,,,
+#define PRODUCTVER     ,,,
+#define STRFILEVER     ", , , \0"
+#define STRPRODUCTVER  ", , , "
diff --git a/src/pgclient/src/Makefile.global b/src/pgclient/src/Makefile.global
index 139b6a61..40efbcab 100644
--- a/src/pgclient/src/Makefile.global
+++ b/src/pgclient/src/Makefile.global
@@ -225,7 +225,7 @@ CFLAGS = -O2 -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-stat
 ifdef LINUX32
 override CFLAGS := -m32 $(CFLAGS)
 else
-override CFLAGS := -m64 $(CFLAGS)
+override CFLAGS := $(CFLAGS)
 endif #LINUX32
 
 
diff --git a/src/pgclient/src/interfaces/libpq/Makefile b/src/pgclient/src/interfaces/libpq/Makefile
index ceb7a27b..6810af38 100644
--- a/src/pgclient/src/interfaces/libpq/Makefile
+++ b/src/pgclient/src/interfaces/libpq/Makefile
@@ -24,7 +24,7 @@ ifneq ($(PORTNAME), win32)
 override CFLAGS += $(PTHREAD_CFLAGS)
 endif
 
-override CFLAGS += -DLINUX -DUSE_SSL -I../../../../odbc/rsodbc/iam/linux/openssl/1.1.1/centos7/gcc5_5/release64/include -DENABLE_GSS
+override CFLAGS += -DLINUX -DUSE_SSL -DENABLE_GSS
 
 # Need to recompile any external C files because we need
 # all object files to use the same compile flags as libpq; some
diff --git a/src/pgclient/src/port/Makefile b/src/pgclient/src/port/Makefile
index 3005cfc9..b4150f52 100644
--- a/src/pgclient/src/port/Makefile
+++ b/src/pgclient/src/port/Makefile
@@ -26,7 +26,7 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-override CFLAGS += -DLINUX -DUSE_SSL -I../../../odbc/rsodbc/iam/linux/openssl/1.1.1/centos7/gcc5_5/release64/include
+override CFLAGS += -DLINUX -DUSE_SSL
 
 ifdef LINUX32
 override CFLAGS := -DLINUX32 $(CFLAGS)