diff --git a/Tools/GNUMake/Make.defs b/Tools/GNUMake/Make.defs
index e1a84a62c83..08b19305d20 100644
--- a/Tools/GNUMake/Make.defs
+++ b/Tools/GNUMake/Make.defs
@@ -44,6 +44,7 @@ else
 endif
 
 ifeq ($(USE_HIP),TRUE)
+  DEBUG := FALSE  # Currently there is a compiler bug for DEBUG=TRUE.
   USE_CUDA := FALSE
   COMP := hip
   HIP_PLATFORM = $(shell hipconfig --compiler)
@@ -347,9 +348,7 @@ SKIP_LINKING ?= FALSE
 USE_COMPILE_PIC ?= FALSE
 
 AMREX_GIT_VERSION := $(shell cd $(AMREX_HOME); git describe --abbrev=12 --dirty --always --tags)
-ifneq ($(USE_HIP),TRUE)
-  DEFINES += -DAMREX_GIT_VERSION=\"$(AMREX_GIT_VERSION)\"
-endif
+DEFINES += -DAMREX_GIT_VERSION=\"$(AMREX_GIT_VERSION)\"
 
 FORTLINK  	= UNDERSCORE
 
@@ -644,30 +643,6 @@ endif
 ifeq ($(USE_HIP),TRUE)
 
     USE_GPU := TRUE
-    AMREX_FCOMP ?= gnu 
-    AMREX_CCOMP ?= hip
-
-    ifneq ($(lowercase_comp),gnu)
-    else ifneq ($(lowercase_comp),hip)
-        $(error HIP can only be used with COMP=hip)
-    endif
-
-#    include $(AMREX_HOME)/Tools/GNUMake/comps/hip.mak
-
-    ifeq ($(USE_MPI),TRUE)
-#      $(error MPI is not supported with HIP)
-
-      export OMPI_CC := hipcc 
-      export OMPI_CXX := hipcc
-      export OMPI_F77 := $(FC)
-      export OMPI_FC  := $(F90)
-
-      export MPICH_CC  := hipcc
-      export MPICH_CXX := hipcc
-      export MPICH_F77 := $(FC)
-      export MPICH_FC  := $(F90)
-
-    endif
 
     DEFINES += -DAMREX_USE_HIP -DAMREX_HIP_PLATFORM=$(HIP_PLATFORM)
 
diff --git a/Tools/GNUMake/Make.rules b/Tools/GNUMake/Make.rules
index 5bf1dd1ae6d..e0f8615d33c 100644
--- a/Tools/GNUMake/Make.rules
+++ b/Tools/GNUMake/Make.rules
@@ -300,6 +300,8 @@ endif
 	@if [ ! -d $(depEXETempDir) ]; then mkdir -p $(depEXETempDir); fi
 ifeq ($(USE_DPCPP),TRUE)
 	$(CXX) $(CXXDEPFLAGS) $< -o $@
+else ifeq ($(USE_HIP),TRUE)
+	$(CXX) $(CXXDEPFLAGS) $< -o $@
 else
 	$(CXX) $(CXXDEPFLAGS) $< > $@
 endif
@@ -313,6 +315,8 @@ endif
 	@if [ ! -d $(depEXETempDir) ]; then mkdir -p $(depEXETempDir); fi
 ifeq ($(USE_DPCPP),TRUE)
 	$(CC) $(CDEPFLAGS) $< -o $@
+else ifeq ($(USE_HIP),TRUE)
+	$(CC) $(CDEPFLAGS) $< -o $@
 else
 	$(CC) $(CDEPFLAGS) $< > $@
 endif
diff --git a/Tools/GNUMake/sites/Make.frontier-coe b/Tools/GNUMake/sites/Make.frontier-coe
index fff48bc643a..68290001bf7 100644
--- a/Tools/GNUMake/sites/Make.frontier-coe
+++ b/Tools/GNUMake/sites/Make.frontier-coe
@@ -5,4 +5,15 @@ else
     CXXFLAGS += --amdgpu-target=gfx906,gfx908
     HIPCC_FLAGS += --amdgpu-target=gfx906,gfx908
   endif
+
+  ifeq ($(USE_MPI),TRUE)
+     INCLUDE_LOCATIONS += $(MPI_HOME)/include
+     LIBRARY_LOCATIONS += $(MPI_HOME)/lib
+     mpicxx_link_flags := $(shell mpicxx -link_info)
+     LIBRARIES += $(filter -Wl%,$(mpicxx_link_flags))
+     ifneq ($(BL_NO_FORT),TRUE)
+       LIBRARIES += -lmpifort
+     endif
+     LIBRARIES += -lmpi
+  endif
 endif